tree 71148ebfc5b92467408b8f1a7e5e37b464f481f3
parent bc0b010ecc7254b0e2c7a0268e5242557579b471
parent 38ddeaa67e52810da5db42895edb74b79111ec53
author Jeff Sharkey <jsharkey@android.com> 1320802023 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1320802023 -0800

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