tree 9769ef3a39e3d56186156752de9b379bd3769911
parent 3e8666172bf1cc7f35d8ca425476e57b86299320
parent 48745fbc41baf9ee69faa5b53a2d79626964e341
author Tao Bao <tbao@google.com> 1478276337 +0000
committer android-build-merger <android-build-merger@google.com> 1478276337 +0000

Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac am: b9c3411de7
am: 48745fbc41

Change-Id: I14e485e0125a8473d580fb58510761f2a2337fb5