tree db1522b7b3f6cf8069b93955c0db7c7e88601015
parent 408edfafc5fdb47dcf411b296ed9659b4dfe5f31
parent 05c68a8775978688ea1e4f74a2f9c932acc90f2f
author Tao Bao <tbao@google.com> 1477525321 +0000
committer android-build-merger <android-build-merger@google.com> 1477525321 +0000

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

Change-Id: Id4a669bfce4f12a25ed78919d61de8c16a12fd27