Commits
Jeff Sharkey authored and Android Git Automerger committed 79c4ad17f96M
am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1 * commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a': Avoid inconsistent state when remove fails.
Showing diff to0816b0c871e