tree c021e106ee6994d745ac12d70722c0b986aa13ff
parent 77fc5fd4ef4cc69c0cf67d3d146b85f94cad4fbd
parent d3865b7a639d6147540c9e6c75d82792246618cc
author Bill Yi <byi@google.com> 1600494683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494683 +0000

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

am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb0917365 is in history

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

Change-Id: Ia407d049114e49a25cb0b4d1d4722d2c1a34a339