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

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