tree 904bd1cdcbf5ef265464fe29e1278d5412621aef
parent 05c68a8775978688ea1e4f74a2f9c932acc90f2f
parent 0c571e5923526477a3994458da1c4320b87ea863
author Dan Albert <danalbert@google.com> 1477544300 +0000
committer android-build-merger <android-build-merger@google.com> 1477544300 +0000

Merge "Revert "Some cleanups to recovery."" am: 9514eb1934
am: 0c571e5923

Change-Id: I1a5b89905f24c2f20250a288345b6dbdea486cc1