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

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