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

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