tree 8a627dfb738987b5c1a3181b96b141e628f172ae
parent 934505ba52f8282e1886fcbf7c7ba0401e957f76
parent 74538db6848e1a315923ec765436b62eb3147537
author Tianjie Xu <xunchang@google.com> 1595619073 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595619073 +0000

Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2 am: 74538db684

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

Change-Id: I9fdb4e98eebc0caa9aa1a2bcc9e188a2b6fa6a81