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

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