AI 146345: am: CL 146341 g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)   Original author: ddougherty   Merged from: //branches/cupcake/...
AI 146345: am: CL 146341 g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)
  Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146345

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