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

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