tree c7a4a5e7fb5b66842c745aef778e6d4cfc2b886d
parent e7034ce855daa807d82a6c86569b08d051c55d7c
parent 435a5fc0c288c0134edc597c2297a602602be108
author Tianjie Xu <xunchang@google.com> 1595617969 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595617969 +0000

Merge changes I0f3f0333,If447b2cf am: 435a5fc0c2

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

Change-Id: Ibfa4188fb6efc1455eb48069ce925adecfc9fd6c