tree b3849ba2cfbc50b96f65719b6d0682d38aaada2a
parent 5490344493d453a8b21f21145e612e91c8dfc6d0
parent 602f36a0a5f95bfb933550d53d3f203e7baea9fd
author Bill Yi <byi@google.com> 1600676874 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600676874 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461 am: d3865b7a63 -s ours am: c4eabe78c5 -s ours am: c00dfe5d95 -s ours am: 602f36a0a5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5de7704ce6d66cd542d3600d337e602221395937