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

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