tree 5dd97229a584eb17c2a9f5e65e0646f0ab2b7ce8
parent 00f893fe23a7cee4200a1192c7dded26f114e3d6
parent 9514eb1934f84a926732936a9041e2c8b7587ef7
author Dan Albert <danalbert@google.com> 1477544028 +0000
committer android-build-merger <android-build-merger@google.com> 1477544028 +0000

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

Change-Id: Id96135ffde5adaebd45811b9c3d319a99fe28ecd