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

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