summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 01:39:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 01:39:08 +0000
commitb38ea2600ad69bab4885aba6984c2dddb8a7a97a (patch)
tree0ffef1012dfebf8af3acf0ad88dc9aadd8e5a3fe
parent2b6b28f2fc52965c1dd9a5a08d67f6fe2f7db295 (diff)
parentec67d2018b969bd11c4ed1dd16d6d8da7004561e (diff)
downloadsound_trigger_hal-b38ea2600ad69bab4885aba6984c2dddb8a7a97a.tar.gz
[automerger skipped] Merge Android 12 am: 43866e9b9d -s ours am: ec67d2018b -s ours
am skip reason: Merged-In I3f9ffb1d2b3f37a61c69c8e34ccc0b8fc9dc9668 with SHA-1 e05907e367 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1847442 Change-Id: I1a0fc8f845c4e6af5df3ac5916769bc3f42fff46
0 files changed, 0 insertions, 0 deletions