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

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