am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1

* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.
This commit is contained in:
Jeff Sharkey 2011-11-09 14:36:36 +00:00 committed by Android Git Automerger
commit 48e5483f44

Diff Content Not Available