tree 456ba84f1d43e6e76c2806880a318d0de31b869b
parent e1e08fc8d1276d3f2499f41da2a5cc89a9e9aa68
parent 2172474d50c7ce7cc54cedb8499a0f4d939bd8a2
author Xin Li <delphij@google.com> 1599784775 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784775 +0000

[automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours

am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

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

Change-Id: Ia3b57074613c623ea3105505c4b32b29baba3436