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

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