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

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