aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add license type: LGPL+GPL are RESTRICTED licenses am: 6ef29d88fa am: ae62283861HEADmasterBob Badour2020-04-241-0/+1
|\
| * Add license type: LGPL+GPL are RESTRICTED licenses am: 6ef29d88faandroid-r-beta-3android-r-beta-2Bob Badour2020-04-241-0/+1
| |\
| | * Add license type: LGPL+GPL are RESTRICTED licensesBob Badour2020-04-231-0/+1
| |/
* | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devXin 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
| | |\
* | | | Remove reference to java.xml.ws.annotation. am: 188dc7001f am: c3aaa4c6f2 am:...Pete Gillin2019-10-111-3/+0
|\| | |
| * | | Remove reference to java.xml.ws.annotation. am: 188dc7001f am: c3aaa4c6f2Pete Gillin2019-10-111-3/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Remove reference to java.xml.ws.annotation. am: 188dc7001fPete Gillin2019-10-111-3/+0
| | |\|
| | | * Remove reference to java.xml.ws.annotation.Pete Gillin2019-10-111-3/+0
| | | |\
| | | | * Remove reference to java.xml.ws.annotation.Pete Gillin2019-10-111-3/+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] DO NOT MERGE - Merge Android 10 into master am: cb5c455e...Xin Li2019-09-050-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: cb5c455e...Xin Li2019-09-050-0/+0
| |\| | |
| | * | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: cb5c455e...Xin Li2019-09-050-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | [automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-050-0/+0
| | | |\|
| | | | * DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li2019-09-041-0/+3
| | | | |\
* | | | | | [automerger skipped] Pull commits from upstream for java 11 compatibility! am...Eugene Susla2019-08-120-0/+0
|\| | | | |
| * | | | | Pull commits from upstream for java 11 compatibility! am: 9f80b7e1e7 am: 6525...Eugene Susla2019-08-121628-36796/+70640
| |\| | | |
| | * | | | Pull commits from upstream for java 11 compatibility! am: 9f80b7e1e7 am: 6525...Eugene Susla2019-08-121628-36796/+70640
| | |\| | |
| | | * | | Pull commits from upstream for java 11 compatibility! am: 9f80b7e1e7Eugene Susla2019-08-121628-36796/+70640
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Pull commits from upstream for java 11 compatibility!Eugene Susla2019-08-121628-36796/+70640
| | | | |\|
| | | | | * Pull commits from upstream for java 11 compatibility!Eugene Susla2019-08-091628-36796/+70640
* | | | | | [automerger skipped] Javaparser Android.bp am: fe0ef2213f -s ours am: 4086233...Eugene Susla2019-08-120-0/+0
|\| | | | |
| * | | | | [automerger skipped] Javaparser Android.bp am: fe0ef2213f -s ours am: 4086233...Eugene Susla2019-08-120-0/+0
| |\| | | |
| | * | | | [automerger skipped] Javaparser Android.bp am: fe0ef2213f -s ours am: 4086233...Eugene Susla2019-08-120-0/+0
| |/| | | | | | |/ / /
| | * | | [automerger skipped] Javaparser Android.bp am: fe0ef2213f -s oursEugene Susla2019-08-120-0/+0
| | |\| |
| | | * | [automerger skipped] Javaparser Android.bpEugene Susla2019-08-120-0/+0
| | |/| | | | | |/
| | | * Javaparser Android.bpEugene Susla2019-08-0912-0/+15036
* | | | Pull commits from upstream for java 11 compatibility!Eugene Susla2019-07-311628-36796/+70640
* | | | [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-0112-0/+15039
| |\ \ | |/ / |/| / | |/
* | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-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-240-0/+0
|\|
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| |\
* | \ Add default active developers into OWNERS am: 5a57bd3ed7 am: 4a7edc26ccChih-Hung Hsieh2019-01-041-0/+5
|\ \ \ | | |/ | |/|
| * | Add default active developers into OWNERS am: 5a57bd3ed7Chih-Hung Hsieh2019-01-041-0/+5
| |\|
| | * Add default active developers into OWNERSChih-Hung Hsieh2019-01-041-0/+5
| | |\
| | | * Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh2019-01-041-0/+5
* | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
|\| | |
| * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| |\| |
| | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\|
| | | * Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2Bill Yi2018-10-240-0/+0
| | | |\
* | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
|\| | | |
| * | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| |\| | |
| | * | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Snap for 4632767 from 1afe9e0652b9b53edade5aa276162abe27b32a67 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_r3android-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_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-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_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_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-03-041765-0/+218384
| | | |\