am f080a5ad: Merge "DO NOT MERGE" into eclair
am f080a5ad: Merge "DO NOT MERGE" into eclair

Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp

* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
  DO NOT MERGE

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