am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs

* commit 'b32987ec2f8fbe887be4a6f4ed9a17f8e0a8cf22':
  docs: platform updates for api 21

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