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

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