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

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