am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master
am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master

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