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

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