summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt" am: cad29fea63HEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4Bob Badour2021-02-056-0/+18
|\
| * Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt"android-s-preview-1Bob Badour2021-02-056-0/+18
|/|
| * [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/btBob Badour2021-02-056-0/+18
|/
* Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99 am: 42cbe7d5ea ...Treehugger Robot2020-05-041-0/+3
|\
| * Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99 am: 42cbe7d5ea ...Treehugger Robot2020-05-041-0/+3
|/|
| * Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99 am: 42cbe7d5eaTreehugger Robot2020-05-041-0/+3
|/|
| * Merge "Add METADATA to bt: Apache2+BSD=NOTICE" am: 2e696fca99android-r-beta-3android-r-beta-2Treehugger Robot2020-05-041-0/+3
| |\
| | * Merge "Add METADATA to bt: Apache2+BSD=NOTICE"Treehugger Robot2020-05-041-0/+3
| |/|
| | * Add METADATA to bt: Apache2+BSD=NOTICEBob Badour2020-05-011-0/+3
| |/
* | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-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_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li2019-10-300-0/+0
|\|
| * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
| |\
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| | |\ | | |/ | |/|
* | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
|\| |
| * | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\ \
| | * | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | |\|
| | | * Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | | |\
* | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
|\| | | |
| * | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| |\| | | | | |_|/ | |/| |
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| |/| |
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| | |\|
| | | * Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li2019-09-052-2/+2
| | | |\
| | | | * DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-042-2/+2
| | | |/| | | | |/ | | |/|
* | | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
|\| | |
| * | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-020-0/+0
|/| | | | |/ /
| * | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-012-2/+2
| |\ \ | |/ / |/| / | |/
* | Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
|\ \
| * | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\|
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| | |\
* | | | Merge "Add default code reviewers into OWNERS" am: 7b79d9b740 am: 652a17c178Chih-hung Hsieh2019-01-171-0/+4
|\| | |
| * | | Merge "Add default code reviewers into OWNERS" am: 7b79d9b740Chih-hung Hsieh2019-01-171-0/+4
| |\| | | | |/ | |/|
| | * Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-171-0/+4
| | |\
| | | * Merge "Add default code reviewers into OWNERS"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-hung Hsieh2019-01-171-0/+4
| | | |\
| | | | * Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-151-0/+4
| | | |/
* | | | [automerger skipped] Merge "DO NOT MERGE" am: 84ef44b885 -s ours am: 47416ec...Xin Li2018-12-100-0/+0
|\| | |
| * | | [automerger skipped] Merge "DO NOT MERGE" am: 84ef44b885 -s oursXin Li2018-12-100-0/+0
| |\| |
| | * | [automerger skipped] Merge "DO NOT MERGE"Xin Li2018-12-100-0/+0
| | |\|
| | | * Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot2018-12-100-0/+0
| | |/|
| | | * DO NOT MERGEXin Li2018-12-070-0/+0
| | |/|
| | | * Snap for 4598635 from 6d726dbcca7d0b5d1f8b338bc0279539c2b9deb0 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot2018-02-111-0/+1
| | | |\
| | | * \ Snap for 4574286 from dce6a114229a6ecf183a45ef9f95e3147afdb07a to pi-releaseandroid-build-team Robot2018-01-307-7/+13
| | | |\ \
| | | * \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | |\ \ \
| | | | * \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Snap for 4557233 from f382f94d6b828304b3af8510a2f68befa9dd0014 to pi-releaseandroid-build-team Robot2018-01-211-0/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Snap for 4531101 from 658430de89312bb75ee272166d0a6cbebf90200e to pi-releaseandroid-build-team Robot2018-01-074-0/+4
| | | |\ \ \ \
| | | * \ \ \ \ Snap for 4517567 from 113145a101873f99f881fcf48f412cf04c9b57cc to pi-releaseandroid-build-team Robot2017-12-241-12/+5
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Snap for 4496165 from 0d4d2a04a2a1d746440621e72eb96a42c4d77b22 to pi-releaseandroid-build-team Robot2017-12-110-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Snap for 4453288 from 935fcd84eabdf5da7fd9215bd7cdccc7eac15887 to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Snap for 4437123 from 79990100551d3080ac89e4e0e5ffd8c486d34a06 to pi-releaseandroid-build-team Robot2017-11-071-0/+9
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Snap for 4402171 from fb594f1bd833d7dfe990c032f2a4cc97864a6fb0 to pi-releaseandroid-build-team Robot2017-10-1821-0/+7142
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-43675...android-build-team Robot2017-09-2920-7198/+0
| | | |\ \ \ \ \ \ \ \ \ \