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

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