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

[automerger skipped] Merge Android 12L am: dcd1fc0da4 -s ours am: 342eeeb427 -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: Ia739f0410821c84991bca495293c394b757b88e3