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

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