am 09550fde: am c9966891: Merge change Ibb245ea7 into eclair
am 09550fde: am c9966891: Merge change Ibb245ea7 into eclair

Merge commit '09550fde489a6d5155f005fec9b328f1b2a878a6' into eclair-mr2-plus-aosp

* commit '09550fde489a6d5155f005fec9b328f1b2a878a6':
  Return an empty PluginList instead of null for the

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base