diff options
author | Xin Li <delphij@google.com> | 2021-03-04 00:12:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-04 00:12:02 +0000 |
commit | 1aa7db2ab11ac5684bf34d3d678f8a79e607c5f4 (patch) | |
tree | 0ffef1012dfebf8af3acf0ad88dc9aadd8e5a3fe | |
parent | 6d0fd28955f0cb28b844f615127a53bb7cfa93c8 (diff) | |
parent | 79a6b9586b66425a77bac0056a18a66dace57e0a (diff) | |
download | sound_trigger_hal-1aa7db2ab11ac5684bf34d3d678f8a79e607c5f4.tar.gz |
[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: 358976caaa -s ours am: 79a6b9586b -s oursandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
am skip reason: Change-Id I0bcb339f01c664e59e258daf901460523b84c468 with SHA-1 d38016f885 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1613216
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I033a76f2c7943b0021399f14f4864f897c4a7732
0 files changed, 0 insertions, 0 deletions