tree 00d7749b9e5380f91443b69898c62df89620a577
parent 917be35f0fe66f216a7b544466c91326363e7e53
parent a7a8262944d03b068a5f040a9ff40ac260770135
author Tao Bao <tbao@google.com> 1478275706 +0000
committer android-build-merger <android-build-merger@google.com> 1478275706 +0000

Merge "Revert "Revert "Some cleanups to recovery."""
am: a7a8262944

Change-Id: Iab6de4788c4dbecd33d076144f8324fde53b4024