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:
commit
570ce763bb