tree 75cf19c94f1b68eb875ab7db62526dacdb04d0ca
parent fe490db9e8f8dde6edc527664efb4a1cf6c328b9
parent c4f3bcb462bd5c7d1094fb47b498480c71f74ed3
author Xin Li <delphij@google.com> 1646825805 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646825805 +0000

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