tree 8a627dfb738987b5c1a3181b96b141e628f172ae
parent 9955de88ade1af0c13aa18cdbe6c1047aa207f73
parent 8885ef0529717451933c9f4a28cb4b8875c913f3
author Tianjie Xu <xunchang@google.com> 1595620860 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595620860 +0000

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

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

Change-Id: Id01eaa738f1f7e6fdc4581bfccf4521e2f2bd346