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

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