Android 2.1 release 2
Merge "SDK Updater: prevent potential NPE." into eclair