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

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