am 28230f8b: am 9b3ebb12: Merge "Update API" into jb-mr2-dev
am 28230f8b: am 9b3ebb12: Merge "Update API" into jb-mr2-dev

* commit '28230f8b270d28b9628e41722d846a4cccbcb994':
  Update API

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