summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 7674630 from 5e29fcd9a6dad5b1cd36dcf37a66dc16ed9b572b to sdk-...sdk-releaseAndroid Build Coastguard Worker2021-08-261-1/+1
|\
| * Snap for 7674630 from 5e29fcd9a6dad5b1cd36dcf37a66dc16ed9b572b to sdk-releaseAndroid Build Coastguard Worker2021-08-261-1/+1
|/|
| * Merge "Remove ndk_platform backend. Use the ndk backend."HEADandroid-s-beta-5masterandroid-s-beta-5Treehugger Robot2021-08-201-1/+1
| |\
| | * Remove ndk_platform backend. Use the ndk backend.Jiyong Park2021-08-091-1/+1
| |/
* | Merge "Snap for 7487883 from 87f5e5c4fc8f794990728a02e6f29fe0472c5785 to sdk-...Android Build Coastguard Worker2021-06-241-14/+12
|\ \
| * | Snap for 7487883 from 87f5e5c4fc8f794990728a02e6f29fe0472c5785 to sdk-releaseAndroid Build Coastguard Worker2021-06-241-14/+12
|/| | | |/
| * Merge "DO NOT MERGE - Merge RQ3A.210605.005"android-s-beta-4android-s-beta-3android-s-beta-4Xin Li2021-06-211-14/+12
| |\
| | * DO NOT MERGE - Merge RQ3A.210605.005Xin Li2021-06-181-14/+12
| |/|
| | * DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li2021-06-170-0/+0
| | |\
| | | * Merge "Snap for 7066328 from 53fd072329547b00e26b92d0528eda7fa8d7c974 to rvc-...android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot2021-01-070-0/+0
| | | |\
| | | | * Snap for 7066328 from 53fd072329547b00e26b92d0528eda7fa8d7c974 to rvc-qpr3-re...android-build-team Robot2021-01-071-14/+12
| | | | |\
| | | * | \ Snap for 7066328 from 53fd072329547b00e26b92d0528eda7fa8d7c974 to rvc-qpr3-re...android-build-team Robot2021-01-071-14/+12
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | * | | DO NOT MERGE - Merge ab/7272582Xin Li2021-06-171-14/+12
| |/| | |
| | * | | [automerger skipped] Mark ab/7061308 as merged in stage. am: 9cfbee1969 -s oursXin Li2021-02-200-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/audio" am: 92b972b08f a...Bob Badour2021-02-196-0/+32
| | |\ \ \
| | * \ \ \ Merge "Specify version for aidl_interface explicitly" am: 79d73c138a am: 2651...Treehugger Robot2021-02-161-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge "Fix license_type. Contains LGPL" am: b5a54f4c24 am: dade89604bBob Badour2021-01-261-1/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ audio_hal: Ensure input buffer size represents an integral number of am: 53fd...llololo2021-01-061-14/+12
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | audio_hal: Ensure input buffer size represents an integral number ofllololo2021-01-051-14/+12
| | | | |_|_|/ | | | |/| | |
* | | | | | | Merge "Snap for 7183507 from 9cfbee19697b606ad115b5556f6fcbed9e50a21e to sdk-...platform-tools-31.0.2platform-tools-31.0.1android-build-prod (mdb)2021-03-046-1/+33
|\ \ \ \ \ \ \
| * | | | | | | Snap for 7183507 from 9cfbee19697b606ad115b5556f6fcbed9e50a21e to sdk-releaseandroid-build-prod (mdb)2021-03-046-1/+33
|/| | | | | | | | |/ / / / / /
| * | | | | / Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li2021-02-200-0/+0
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 93c7f25b...Xin Li2020-12-100-0/+0
| | |\ \ \ \
| | * \ \ \ \ [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 2...Xin Li2020-12-030-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ [automerger skipped] Skip ab/6749736 in stage. am: d809f306aa -s ours am: c5b...Xin Li2020-10-090-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ [automerger skipped] Skip ab/6749736 in stage. am: d809f306aa -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/audio" am: 92b972b08fBob Badour2021-02-196-0/+32
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/audio"Bob Badour2021-02-186-0/+32
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/audioBob Badour2021-02-166-0/+32
| | |/ / / / / / / /
| * | | | | | | | / Merge "Specify version for aidl_interface explicitly" am: 79d73c138aTreehugger Robot2021-02-161-1/+1
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Merge "Specify version for aidl_interface explicitly"android-s-preview-1Treehugger Robot2021-02-161-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Specify version for aidl_interface explicitlyJeongik Cha2021-02-151-1/+1
| | |/ / / / / / /
| * | | | | | / / Merge "Fix license_type. Contains LGPL" am: b5a54f4c24Bob Badour2021-01-261-1/+2
| |\| | | | | | | | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 93c7f25b...Xin Li2020-12-100-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Snap for 7110675 from b5a54f4c24b67cb439eb0e1003d63a0d065224aa to sdk-...platform-tools-31.0.0android-build-prod (mdb)2021-01-292-9/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Snap for 7110675 from b5a54f4c24b67cb439eb0e1003d63a0d065224aa to sdk-releaseandroid-build-prod (mdb)2021-01-292-9/+8
|/| | | | | | | | | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "Fix license_type. Contains LGPL"Bob Badour2021-01-261-1/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix license_type. Contains LGPLBob Badour2021-01-211-1/+2
| |/ / / / / /
| * | | | | | Merge "DO NOT MERGE - Merge Android R QPR1"Xin Li2020-12-101-8/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | DO NOT MERGE - Merge Android R QPR1Xin Li2020-12-081-8/+6
| |/| | | | | | | |/ / / /
| | * / / / Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li2020-11-231-8/+6
| |/| | | | | | |/ / /
| | * | | hal: remove out_standby_l when usb headset is unplugged during playback of co...Lei Pi2020-09-251-8/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | hal: remove out_standby_l when usb headset is unplugged during playback of co...android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr2-releaseandroid11-qpr1-c-releaseLei Pi2020-09-201-8/+0
| | * | | [automerger skipped] Merge "Merge Android R" am: 374a037174 -s ours am: 21ce9...Xin Li2020-09-110-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | [automerger skipped] Merge "Merge Android R" am: 374a037174 -s ours am: 21ce9...Xin Li2020-09-110-0/+0
| | | |\ \
| | | | * \ [automerger skipped] Merge "Merge Android R" am: 374a037174 -s ours am: 21ce9...Xin Li2020-09-110-0/+0
| | | | |\ \
| | * | | \ \ audio hal: fix voip volume update in check_and_route_playback_usecases() am: ...Eric Laurent2020-09-081-0/+6
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | audio hal: fix voip volume update in check_and_route_playback_usecases()Eric Laurent2020-09-021-0/+6
| | * | | | | [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
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |