tree 4a84e4051e4c162128d9d3eb24feb25a606bc140
parent 85140c6f17ed9704491e9f37c42eca78595e39fd
parent 6e35461b694d28b3699969bdf57be1963a1d5728
author Tianjie Xu <xunchang@google.com> 1595621670 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595621670 +0000

Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 am: 74538db684 am: 435f3d3f16 am: 8885ef0529 am: 6e35461b69

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1371051

Change-Id: I62b4a7cc5231baadb3a19f27db562abaa63f1fa5