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

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