Automated import from //branches/cupcake/...@142317,142317
Automated import from //branches/cupcake/...@142317,142317

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