commit | b0677d38dc3696eb2fd46d6243f5137371e67a98 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Oct 08 08:30:07 2021 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 08:30:07 2021 +0000 |
tree | 36c0894b6018baad992fa026f72e9968da968b3c | |
parent | 4a56e9db6bc98f305ffd803e19981579b8fec19a [diff] | |
parent | b34923fb47fceeac9557208d975b374a42e4a4ac [diff] |
[automerger skipped] Merge Android 12 am: e681c66b42 -s ours am: 95b1801fa2 -s ours am: 2e37a4dbda -s ours am: b34923fb47 -s ours am skip reason: Merged-In Id5f58e8cb24bcba19ec2253a9ca5d0703a54b43b with SHA-1 8c87763c0a is already in history Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1847157 Change-Id: I28e1ee90edc68790017712d41ffbcd74ac67ae47