tree 92a2d7d3ea8ecfaa1aa7304d5667cfbf25c1d2e4
parent 265659dc0ea910afae002767af69a83441fbb125
parent 4d457eb3ede454fec8ce5b1997b6070151e1289c
author Xin Li <delphij@google.com> 1599864069 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599864069 +0000

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