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

Merge commit 'b85c8ea67505afad2124bad28de4f5d4cbe2885c'

* commit 'b85c8ea67505afad2124bad28de4f5d4cbe2885c':
  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