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

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