am a47d1536: do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
am a47d1536: do not merge - Fix for issue 2184627 cherry picked from eclair-mr2

Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-plus-aosp

* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2

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