tree 2625dc3ea5caed169d4b19226c42d0115d76a9c8
parent 96547f6d9fcd3a43fa35bba3ec2a56e15bf2d64a
parent e87053a4f83a09651f89ed83d720c89a48578cfd
author Xin Li <delphij@google.com> 1633681755 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681755 +0000

[automerger skipped] Merge "Merge Android 12" am: f601f40512 -s ours am: 430a585802 -s ours am: b0ab7df290 -s ours am: e87053a4f8 -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: I0bb80a719f54acc713629d1b85b58e5eb528974a