tree 2625dc3ea5caed169d4b19226c42d0115d76a9c8
parent 1a71a61f36db997f41ad076877f9608c4ba96d63
parent 5783987ad037cbf6ff994df7568f35dc6755b566
author Xin Li <delphij@google.com> 1633683566 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683566 +0000

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