tree 2625dc3ea5caed169d4b19226c42d0115d76a9c8
parent 6a26aec1659ed5feb2c073f70ee1930177dfa536
parent b0ab7df2904711abbdfca427dc74956fcbc46fe6
author Xin Li <delphij@google.com> 1633679777 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679777 +0000

[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: 430a585802 -s ours am: b0ab7df290 -s ours

am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313

Change-Id: I621e60e077d18aa33704b79f635f33b4000c7d23