tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent 9233d47dc131a6b4b14da588e3be2dedbf359648
parent 37059f4ee5880954cdf358d6e3e1ce8455f203a1
author Xin Li <delphij@google.com> 1599796721 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796721 +0000

[automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours am: 4b028fac0b -s ours am: 37059f4ee5 -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: Ic3307da2b882e5ca73f57ecfe5e0652bba870d7b