tree 2625dc3ea5caed169d4b19226c42d0115d76a9c8
parent 2fe8554eae50f4473c46d3c312c82b39b524008d
parent f601f4051250ab61c4b84859f128c41fa413efc5
author Xin Li <delphij@google.com> 1633655976 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655976 +0000

[automerger skipped] Merge "Merge Android 12" am: f601f40512 -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: I3aa715c5e25f32607dc96630bc0ac233c6d35b02