summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 22e1e4a11c3d5dc3d25747054065e03e680c62d6 to ↵aml_sdk_341710000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010android14-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: I5228a80c330270379106bb6c15dec6b470eb2452
2022-05-10Snap for 8564071 from 2be2e96210253816487f8fcff8f439ddf9b0d3ea to ↵aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010android13-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: I4ad11669b5939f79288569580dfd801268c2c765
2022-03-18Replace platform_version_use_sound_trigger_hal with ↵HEADandroid-14.0.0_r50android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr3-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseCole Faust
sound_trigger_hal_is_android_p am: 2434cf8de6 am: e11e7edb62 am: 65c1bdbb3b am: 61ca38058a am: 2be2e96210 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/2030924 Change-Id: Idae293b1adc0c7c6e9703f476015c56fae07918d
2022-03-18Replace platform_version_use_sound_trigger_hal with ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Cole Faust
sound_trigger_hal_is_android_p am: 2434cf8de6 am: e11e7edb62 am: 65c1bdbb3b am: 61ca38058a Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/2030924 Change-Id: I68ad574ae6ace2543c7b1c67c972523c8b6011a0
2022-03-18Replace platform_version_use_sound_trigger_hal with ↵Cole Faust
sound_trigger_hal_is_android_p am: 2434cf8de6 am: e11e7edb62 am: 65c1bdbb3b am: 61ca38058a Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/2030924 Change-Id: If6bb6ddadaacc4b68006c673789f937e826949ff
2022-03-18Replace platform_version_use_sound_trigger_hal with ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-u-beta-1-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16k-with-phonesmain-16kandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseCole Faust
sound_trigger_hal_is_android_p am: 2434cf8de6 am: e11e7edb62 am: 65c1bdbb3b Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/2030924 Change-Id: I147ed0c8174e8a8acc8f0710033b64d824fa9bf2
2022-03-18Replace platform_version_use_sound_trigger_hal with ↵Cole Faust
sound_trigger_hal_is_android_p am: 2434cf8de6 am: e11e7edb62 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/2030924 Change-Id: I90d057554a25897a6df512fa6c77f68525edfc06
2022-03-17Replace platform_version_use_sound_trigger_hal with ↵Cole Faust
sound_trigger_hal_is_android_p am: 2434cf8de6 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/2030924 Change-Id: I46bad6ca6fc8b0eaf33510845a4bce7d73f2ac71
2022-03-17Replace platform_version_use_sound_trigger_hal with ↵Cole Faust
sound_trigger_hal_is_android_p This is to facilitate making it a requirement for soong_config_string_variables to only be set to one of their possible values. Bug: 220375749 Test: Presubmits Change-Id: I3f718054f842dd196368ea4a03dc76157a21fa2d
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: a793b8970c -s ours am: 473f598fe4 -s ours am skip reason: Merged-In I5b488fa5e435e94b7a62b81bdc543d8126520e5d with SHA-1 ca8a099a26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/16840781 Change-Id: I4571d34202e66e21ee699fd81cc23bc20b74db1a
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: a793b8970c -s ours am skip reason: Merged-In I5b488fa5e435e94b7a62b81bdc543d8126520e5d with SHA-1 ca8a099a26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/16840781 Change-Id: I2c989aca2b7b3280611ff6d33f705eb42d5abac7
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I5b488fa5e435e94b7a62b81bdc543d8126520e5d Change-Id: I1383dcd0d2bcf23c3b228e0cb009f3684f50db14
2022-02-02Replace cutils/log.h by log/log.h am: 94d0dc07e1 am: 389b1c0fa8 am: ↵Yuntao Xu
cbbfeb5b72 am: ad6b96a105 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1967468 Change-Id: Ia922a8798ab47401c3c3c5028ef0734b2b521bc4
2022-02-02Replace cutils/log.h by log/log.h am: 94d0dc07e1 am: 389b1c0fa8 am: cbbfeb5b72Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1967468 Change-Id: I423b513896bc8ff5c27a1401aa513a5c40b6931c
2022-02-02Replace cutils/log.h by log/log.h am: 94d0dc07e1 am: 389b1c0fa8Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1967468 Change-Id: I657525b3395b5dd97605b148e414a5cde02ccc1c
2022-02-02Replace cutils/log.h by log/log.h am: 94d0dc07e1Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1967468 Change-Id: I5b9c20889b1cbd521fe2b01973f28dc5d790f39c
2022-02-01Replace cutils/log.h by log/log.handroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Yuntao Xu
Replaced the cutils/log.h file by the log/log.h file, please refer to b/78370064 and the bug below for more details. Bug: 217477987 Test: make -k tidy-hardware-knowles-athletico-sound_trigger_hal Test: m adnc_strm.primary.default Test: TreeHugger Change-Id: Ia0c9d48d1f9f0322c3684feb6acc4a362d6a2ebb
2022-02-01Convert sound_trigger_hal/Android.mk to Android.bp am: aadb1dc327 am: ↵Yuntao Xu
47e57dd3b9 am: e66135f6b6 am: f245f4a647 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1964939 Change-Id: Ia2dd6a9769aa76d41280b0f6d4d09a5afcc97ace
2022-02-01Convert sound_trigger_hal/Android.mk to Android.bp am: aadb1dc327 am: ↵Yuntao Xu
47e57dd3b9 am: e66135f6b6 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1964939 Change-Id: I64a1a9a6911c1ec607651a59a0a5cda84f7e65e9
2022-02-01Convert sound_trigger_hal/Android.mk to Android.bp am: aadb1dc327 am: 47e57dd3b9Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1964939 Change-Id: I2f338d895d25e23963feec208e6df0f791bfb0bf
2022-02-01Convert sound_trigger_hal/Android.mk to Android.bp am: aadb1dc327Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1964939 Change-Id: Idf7308a3736e597077c22ffd0f347afeea67d752
2022-01-31Convert sound_trigger_hal/Android.mk to Android.bpYuntao Xu
Converted all the Make modules in sound_trigger_hal/Android.mk from Make to Soong. Bug: 205649904 Bug: 205152442 Test: compared the binaries built by Make and Soong Test: TreeHugger Change-Id: I2b6170b0d087f31dc8e056ff3296a0c5d95333a0
2021-10-08[automerger skipped] Merge Android 12 am: 43866e9b9d -s ours am: ec67d2018b ↵Xin Li
-s ours am: b38ea2600a -s ours am: 67a41076f6 -s ours am: 2cf0c68dc0 -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: Ibac09145eff6a32734aed85020e0c32f974f935e
2021-10-08[automerger skipped] Merge Android 12 am: 43866e9b9d -s ours am: ec67d2018b ↵Xin Li
-s ours am: b38ea2600a -s ours am: 67a41076f6 -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: Ie26d8645444e41943d839a6271dd323ce3ba2f4c
2021-10-08[automerger skipped] Merge Android 12 am: 43866e9b9d -s ours am: ec67d2018b ↵Xin Li
-s ours am: b38ea2600a -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: I7afc7f4b245f9b36ec5b340ec8b14fc3f9d3ab93
2021-10-08[automerger skipped] Merge Android 12 am: 43866e9b9d -s ours am: ec67d2018b ↵Xin Li
-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
2021-10-08[automerger skipped] Merge Android 12 am: 43866e9b9d -s oursXin Li
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: Ib19161d507f0c65a25c8a852e59ae5b14bb0793e
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I3f9ffb1d2b3f37a61c69c8e34ccc0b8fc9dc9668 Change-Id: Ia22291a8ec628b35dd1450c1d97afeed3c812407
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e05907e367 -s ours am: 2b6b28f2fc -s ours am: 6669524af4 -s ours am: 305caec522 -s ours am skip reason: Merged-In Iac6689ca06cb524133d0f880b61b56ea21df5261 with SHA-1 8d468c1755 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/15571670 Change-Id: I6d8b4ccae53efd459238dc37d6526147e8c535fe
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e05907e367 -s ours am: 2b6b28f2fc -s ours am: 6669524af4 -s ours am skip reason: Merged-In Iac6689ca06cb524133d0f880b61b56ea21df5261 with SHA-1 8d468c1755 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/15571670 Change-Id: I6d9681b1619eb9e02e36e60b85be842704da2077
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e05907e367 -s ours am: 2b6b28f2fc -s ours am skip reason: Merged-In Iac6689ca06cb524133d0f880b61b56ea21df5261 with SHA-1 8d468c1755 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/15571670 Change-Id: I00ca56937a1bdfe7e95000bdac964b37154e8355
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
e05907e367 -s ours am skip reason: Merged-In Iac6689ca06cb524133d0f880b61b56ea21df5261 with SHA-1 8d468c1755 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/15571670 Change-Id: Icd0044664e97bb2a87c6d404bf952bf27884d87b
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Iac6689ca06cb524133d0f880b61b56ea21df5261 Change-Id: I3f9ffb1d2b3f37a61c69c8e34ccc0b8fc9dc9668
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b0a5f9b660 am: ↵Xin Li
72f85e9639 am: 8d468c1755 -s ours am: 1d5ea16fa2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1735994 Change-Id: I7b32c1095a53e171812945a584eae9747e4092ad
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b0a5f9b660 am: ↵Xin Li
72f85e9639 am: 8d468c1755 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1735994 Change-Id: Ic67d6dd4683ef24f2ade80ce0be3d0748cdb81b8
2021-06-14DO NOT MERGE - Merge ab/7272582 am: b0a5f9b660 am: 72f85e9639Xin Li
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1735994 Change-Id: Iac6689ca06cb524133d0f880b61b56ea21df5261
2021-06-14DO NOT MERGE - Merge ab/7272582 am: b0a5f9b660android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1735994 Change-Id: I0fa312b8e2244fc2e089622be0b830e29c43022c
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Change-Id: Ia43857c695bf1d8822eddc3abdf9c38ec4e03bf0
2021-03-04[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: ↵Xin Li
358976caaa -s ours am: 79a6b9586b -s ours am: 1aa7db2ab1 -s ours 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: I8393f7b8777d0805975f95c88fe4c973b7748f6e
2021-03-04[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: ↵android-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-devXin Li
358976caaa -s ours am: 79a6b9586b -s ours 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
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: ↵temp_ab_7272582Xin Li
358976caaa -s ours 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: Iab677f45318387e2acf78125f1ad00c7e2a20a8c
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s oursXin Li
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: I5dc99ba9c1281f61e9adaa3b884b6b0f9f0c0ed6
2021-03-03Merge RQ2A.210305.007android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I0bcb339f01c664e59e258daf901460523b84c468 Change-Id: I790b0769976ae8ae27c5ccfb98fc4d4862a4b8d0
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: d38016f885 -s ours am: ↵Xin Li
ca76721c0c -s ours am: 6d0fd28955 -s ours am skip reason: Change-Id Iddfc1d7b0f3fbc45f1ccaa6d6d3e075adca93864 with SHA-1 716f26458d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/13658389 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3fe2e8891a49b50c38f2239f39ee179029775789
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: d38016f885 -s ours am: ↵Xin Li
ca76721c0c -s ours am skip reason: Change-Id Iddfc1d7b0f3fbc45f1ccaa6d6d3e075adca93864 with SHA-1 716f26458d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/13658389 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c8b751b7dee50e4fb3bc3f5bee7348b77d4c69d
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: d38016f885 -s oursXin Li
am skip reason: Change-Id Iddfc1d7b0f3fbc45f1ccaa6d6d3e075adca93864 with SHA-1 716f26458d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/13658389 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica6b3c26b518fbeeaeabed5de87124a8d7cb1981
2021-02-21Merge ab/7061308 into stage.temp_RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: Iddfc1d7b0f3fbc45f1ccaa6d6d3e075adca93864 Change-Id: I0bcb339f01c664e59e258daf901460523b84c468
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
hardware/knowles/athletico/sound_trigger_hal am: ca8a099a26 am: 0f952d832c am: 4f843a6913 am: 5d450aa1f8 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1588378 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6300f2146f4d7da7950a834d9b5591407c1f0144
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
hardware/knowles/athletico/sound_trigger_hal am: ca8a099a26 am: 0f952d832c am: 4f843a6913 Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1588378 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6149660ffe97b8b8c931eb7998ef23ef707c84d
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
hardware/knowles/athletico/sound_trigger_hal am: ca8a099a26 am: 0f952d832c Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1588378 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1dd94f05f24e362d65501c0005504b7a603bb2c8
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 04:14:52 +0000