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

This commit is contained in:
Jeff Sharkey 2011-11-08 17:27:03 -08:00 committed by Android (Google) Code Review
commit 0679ce0ae8

Diff Content Not Available