tree 8a910b26d07884180bcef5f5f48781ae642cf99e
parent 76a81f920b4602ccafab6fb03906e69f2dea200a
parent 7a899bb4619254afae3862fd00fc1623743a8b6d
author Bill Yi <byi@google.com> 1600492985 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600492985 +0000

Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461

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

Change-Id: I0a9763656107b95ca90e40e7243190868a31337c