tree 756a57b612611dfd38a1f32e5b97bd3dac6023ca
parent 4098285e8c6b84d3608929ac0ad9a78a18713987
parent cb3cbaffacee7a576a849a3bca5f58e855bd2e48
author Tao Bao <tbao@google.com> 1478275916 +0000
committer android-build-merger <android-build-merger@google.com> 1478275916 +0000

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

Change-Id: I2536156317b0bcb4a272ce13db251af791bd67be