Changed getIcon() method to evaluate acPlugged and usbPlugged instead of asking the battery driver for status
Merge branch 'gingerbread' of ssh://github.com/cdmdata/android_frameworks_base into gingerbread