tree 3e9a72393e5873c870f6882a5116b36dd25730fc
parent 6581dc4d959191ff9cb1d2a5bb86d98e7ed7f500
parent 9d81eb7961025a800a75e2e230f96bba920812ad
author Bill Yi <byi@google.com> 1641522177 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641522177 +0000

[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: c1f7e46319 -s ours am: 9d81eb7961 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia9b945a7dee267e19ce56e4e906dee7581affec1