am 764b0c6c: am 79253f8b: Merge change 24690 into donut
am 764b0c6c: am 79253f8b: Merge change 24690 into donut

Merge commit '764b0c6c66c9e093f246f5bf4085ee815557e034' into eclair-plus-aosp

* commit '764b0c6c66c9e093f246f5bf4085ee815557e034':
  docs only.

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