Automated import from //branches/master/...@140783,140783
Automated import from //branches/master/...@140783,140783

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