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

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