summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE - Merge ab/7272582 am: b0a5f9b660HEADandroid-s-beta-5android-s-beta-4android-s-beta-3masterandroid-s-beta-5android-s-beta-4Xin Li2021-06-140-0/+0
|\
| * DO NOT MERGE - Merge ab/7272582Xin Li2021-06-110-0/+0
| |\
| | * [automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: 358976c...temp_ab_7272582Xin Li2021-03-030-0/+0
| | |\ | |_|/ |/| |
* | | [automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s oursXin Li2021-03-030-0/+0
|\| |
| * | Merge RQ2A.210305.007android-s-beta-2android-s-beta-1Xin Li2021-03-031-0/+4
| |\ \ | |/ / |/| |
| | * [automerger skipped] Merge ab/7061308 into stage. am: d38016f885 -s oursXin Li2021-02-230-0/+0
| | |\ | |_|/ |/| |
* | | Merge ab/7061308 into stage.Xin Li2021-02-211-0/+4
|\ \ \
| | | * [LSC] Add LOCAL_LICENSE_KINDS to hardware/knowles/athletico/sound_trigger_hal...Bob Badour2021-02-191-0/+40
| | |/| | |/|/ | |/| |/| |
* | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/knowles/athletico/sound_trigger_hal...Bob Badour2021-02-191-0/+40
|\ \ \ | | |/ | |/|
| * | [LSC] Add LOCAL_LICENSE_KINDS to hardware/knowles/athletico/sound_trigger_halBob Badour2021-02-121-0/+40
| | * [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 6530472021 -s ou...Xin Li2020-12-100-0/+0
| | |\ | |_|/ |/| |
* | | [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 6530472021 -s oursXin Li2020-12-100-0/+0
|\| |
| * | DO NOT MERGE - Merge Android R QPR1android-s-preview-1Xin Li2020-12-083-13/+66
| |\ \ | |/ / |/| |
| | * [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 2...Xin Li2020-12-030-0/+0
| | |\ | |_|/ |/| |
* | | Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li2020-11-233-13/+66
|\ \ \ | |/ / |/| |
| | * Merge "sthal: prevent double free the inactive model" into rvc-qpr-dev am: 7d...Rios Kao2020-10-191-0/+4
| | |\
| | | * Merge "sthal: prevent double free the inactive model" into rvc-qpr-devandroid-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseRios Kao2020-10-191-0/+4
| | | |\
| | | | * sthal: prevent double free the inactive modelrioskao2020-10-161-0/+4
| | * | | [automerger skipped] Skip ab/6749736 in stage. am: 46533bc15c -s ours am: 1b4...Xin Li2020-10-090-0/+0
| |/| | |
| | * | | [automerger skipped] Skip ab/6749736 in stage. am: 46533bc15c -s oursXin Li2020-10-090-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \
| | * | | | [automerger skipped] Merge Android R am: 373609b119 -s ours am: 3317d12f31 -s...Xin Li2020-09-110-0/+0
| | |\| | |
| | | * | | [automerger skipped] Merge Android R am: 373609b119 -s ours am: 3317d12f31 -s...Xin Li2020-09-110-0/+0
| | | |\ \ \
| | | | * \ \ [automerger skipped] Merge Android R am: 373609b119 -s ours am: 3317d12f31 -s...Xin Li2020-09-110-0/+0
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | [automerger skipped] Merge Android R am: 373609b119 -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge Android RXin Li2020-09-086-283/+511
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| | | * | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | |\| | | |
| | | | * | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | |/| | | | | | |/| |/ / /
| | | | * | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-276-283/+511
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | | * | | | sthal: add support getting dsp identifier from dsp am: c30d34012arioskao2020-08-193-13/+66
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | sthal: add support getting dsp identifier from dspandroid-11.0.0_r30android11-qpr1-c-releaserioskao2020-08-053-13/+66
| | | * | | | Update language to comply with Android's inclusive language guidance am: 8baa...Kelly Rossmoyer2020-07-313-4/+4
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Update language to comply with Android's inclusive language guidance am: 8baa...Kelly Rossmoyer2020-07-313-4/+4
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Update language to comply with Android's inclusive language guidance am: 8baa...Kelly Rossmoyer2020-07-313-4/+4
| | |/| | | | | |/|/ / / / | |/| | | | |/| | | | |
* | | | | | Update language to comply with Android's inclusive language guidance am: 8baa...Kelly Rossmoyer2020-07-313-4/+4
|\ \ \ \ \ \
| * | | | | | Update language to comply with Android's inclusive language guidanceKelly Rossmoyer2020-07-293-4/+4
|/ / / / / /
| | | * | | sthal: fix vts test failure am: f32bf0d37d am: 18279771a6 am: b23f30d364rioskao2020-06-080-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | sthal: fix vts test failure am: f32bf0d37d am: 18279771a6rioskao2020-06-080-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | | * | sthal: fix vts test failure am: f32bf0d37d am: 18279771a6 am: a5a22e4fb0rioskao2020-06-080-0/+0
| | | | |\|
| | | | | * sthal: fix vts test failure am: f32bf0d37d am: 18279771a6rioskao2020-06-081-1/+7
| | | | | |\ | | | | |_|/ | | | |/| |
| | | * | | sthal: fix vts test failure am: f32bf0d37dandroid-11.0.0_r16android11-d1-b-releaserioskao2020-06-081-1/+7
| | | |\ \ \
| | | | | * \ sthal: fix vts test failure am: f32bf0d37d am: a44b9e17c7 am: ca84eee483rioskao2020-06-081-1/+7
| | | | | |\ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | sthal: fix vts test failure am: f32bf0d37d am: a44b9e17c7rioskao2020-06-081-1/+7
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | sthal: fix vts test failure am: f32bf0d37drioskao2020-06-081-1/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | sthal: fix vts test failureandroid11-devrioskao2020-06-031-1/+7
| | | | | * | [automerger skipped] Merge QQ3A.200605.002 into master am: ff09cebd77 -s ours...Xin Li2020-06-080-0/+0
| | | | | |\ \ | | | | |_|/ / | | | |/| | |
| | | * | | | [automerger skipped] Merge QQ3A.200605.002 into master am: ff09cebd77 -s ours...Xin Li2020-06-080-0/+0
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | [automerger skipped] Merge QQ3A.200605.002 into master am: ff09cebd77 -s oursXin Li2020-06-080-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge QQ3A.200605.002 into masterandroid-r-beta-3android-r-beta-2Xin Li2020-06-031-38/+38
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 01:07:02 +0000