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

* commit '79c4ad17f966d0ccf24d94fdcbc6d3f83e359604':
  Avoid inconsistent state when remove fails.
This commit is contained in:
Jeff Sharkey 2011-11-09 21:51:26 +00:00 committed by Android Git Automerger
commit 570ce763bb

Diff Content Not Available