Automated import from //branches/donutburger/...@140780,140780
Automated import from //branches/donutburger/...@140780,140780

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