tree 01a0d3c321d48b0a109ace335bb2911d7d8dc7b1
parent 5b4c017f985e19fd38cb998e7f3b51271b1da3ba
parent ec31f732c3e29978a3379d6c3681af6264621b7a
author Dan Albert <danalbert@google.com> 1477545020 +0000
committer android-build-merger <android-build-merger@google.com> 1477545020 +0000

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

Change-Id: Ib1aa18ed40bdafac182e90c66160a4951db4797d