tree db1522b7b3f6cf8069b93955c0db7c7e88601015
parent 74851d8191fdbd8350ba33778b8fdbb142dfde27
parent 00f893fe23a7cee4200a1192c7dded26f114e3d6
author Tao Bao <tbao@google.com> 1477525021 +0000
committer android-build-merger <android-build-merger@google.com> 1477525021 +0000

Merge "Some cleanups to recovery." am: 46fb0a6a6f
am: 00f893fe23

Change-Id: Iea4884c8ea12f8edfdd7e39e8ec6e4cfff26f3a5