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

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