tree 904bd1cdcbf5ef265464fe29e1278d5412621aef
parent aa2e4ddc30053c904ede048dedb1b67ae4f316b7
parent 3456ee19f9d1a1ac6b58f64f51820653ef52c33b
author Dan Albert <danalbert@google.com> 1477544538 +0000
committer android-build-merger <android-build-merger@google.com> 1477544538 +0000

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

Change-Id: Ia3b0e970555a256d0576a2b94c2f6825f279de7c