tree c29b75bd207b88e71d82409350c35ab894761ac1
parent 218d5fcbed3b18bc26ed48cbe23bda3f189b417e
parent 73f4ba0967cb234476a81defb3beb894cb010460
author Bill Yi <byi@google.com> 1600201931 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600201931 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -s ours am: d757c4c90d -s ours am: 73f4ba0967 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2a2f727c51fd8c5f3ea6b9293cf7a41fe5efb9a1