am 2ee32348: am 77773197: Merge "Don\'t delete objects twice..." into honeycomb
am 2ee32348: am 77773197: Merge "Don\'t delete objects twice..." into honeycomb

* commit '2ee3234885072a41a9bf6d15e989dc7bc218a18f':
  Don't delete objects twice...

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