tree b3849ba2cfbc50b96f65719b6d0682d38aaada2a
parent e6c342aad5409a590c0c7e2dfebb6726e1c71918
parent b75d08ff2ccb06c24292de7951a3f34d90766ec5
author Bill Yi <byi@google.com> 1600676822 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600676822 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5 am: 76a81f920b -s ours am: 77fc5fd4ef -s ours am: ca1ba9ee45 -s ours am: b75d08ff2c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib3cc2b89e0aeff373efcce2b6b22d6a08568fa3f