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

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