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

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