tree 696d1ec85dc835172e8f1c6fa249c1a8b5ad6646
parent e1e4037be7af51d4749de3fcb133e6304c6600cc
parent dcd1fc0da443fa0d22c0ad02ff8be2770f49220f
author Xin Li <delphij@google.com> 1646734768 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734768 +0000

[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s ours

am skip reason: Merged-In I7492a7ad83058fcf9028a9ac18b2424e7cf10b4d with SHA-1 e1e4037be7 is already in history

Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2012789

Change-Id: Ia183bae59fd491740610f0ad2e91934901921cb1