tree c29b75bd207b88e71d82409350c35ab894761ac1
parent 4131afde005128744817618e07b7f46a880bcfe5
parent fabb0fbef56a1fea3023a33213c2b03f96fcf84d
author Xin Li <delphij@google.com> 1599859631 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859631 +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 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: I85ab455872110183950db38a9cc1120ba47ac589