aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: 7cb...HEADmasterTreehugger Robot2020-05-081805-286078/+0
|\
| * Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8android-r-beta-3android-r-beta-2Treehugger Robot2020-05-081805-286078/+0
| |\
| | * Merge "Remove all non-Apache2 licensed files from sdk"Treehugger Robot2020-05-081805-286078/+0
| | |\
| | | * Remove all non-Apache2 licensed files from sdkBob Badour2020-05-061805-286078/+0
| | |/
* | | Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48eBob Badour2020-05-062618-1/+326466
|\| |
| * | Merge "Revert "Remove unused project."" am: fc7cda06f5Bob Badour2020-05-062618-1/+326466
| |\|
| | * Merge "Revert "Remove unused project.""Bob Badour2020-05-062618-1/+326466
| | |\
| | | * Revert "Remove unused project."Paul Duffin2020-05-062618-1/+326466
* | | | Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44eTreehugger Robot2020-05-062618-326466/+1
|\| | |
| * | | Merge "Remove unused project." am: 1aa104fb55Treehugger Robot2020-05-062618-326466/+1
| |\| |
| | * | Merge "Remove unused project."Treehugger Robot2020-05-062618-326466/+1
| |/| | | | |/
| | * Remove unused project.Bob Badour2020-05-052618-326466/+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
| | |\ | | |/ | |/|
* | | [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-0560-1637/+0
| | | |\
| | | | * DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-0460-1637/+0
| | | |/| | | | |/ | | |/|
* | | | [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-0160-1637/+0
| | |\ \ | | |/ / | |/| / | | |/
* | | Merge changes Ia74dd04d,Ib6a6d3fe am: 6590b8f4bb am: 7a2519030aDan Willemsen2019-05-1316-166/+104
|\| |
| * | Merge changes Ia74dd04d,Ib6a6d3fe am: 6590b8f4bbDan Willemsen2019-05-1316-166/+104
|/| | | |/
| * Merge changes Ia74dd04d,Ib6a6d3feandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Dan Willemsen2019-05-1323-788/+104
| |\
| | * Merge changes Ia74dd04d,Ib6a6d3feTreehugger Robot2019-05-1323-788/+104
| |/|
| | * Convert to Android.bpDan Willemsen2019-05-1116-166/+104
| | * Remove mksdcard from the System source treeJim Kaye2019-05-107-622/+0
| |/
* | Merge stage-aosp-master into pi-dev-plus-aospandroid-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-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-masterXin Li2019-02-200-0/+0
| | |\
* | | | Merge "find_java2: Fix array size calculation" am: 1400d85340 am: c73b2761d7Greg Kaiser2019-01-241-1/+1
|\| | |
| * | | Merge "find_java2: Fix array size calculation" am: 1400d85340Greg Kaiser2019-01-241-1/+1
| |\| |
| | * | Merge "find_java2: Fix array size calculation"Greg Kaiser2019-01-241-1/+1
| | |\ \
| | | * \ Merge "find_java2: Fix array size calculation"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-releaseTreehugger Robot2019-01-241-1/+1
| | | |\ \
| | | | * | find_java2: Fix array size calculationGreg Kaiser2018-12-281-1/+1
* | | | | | Merge "Remove LOCAL_MODULE_TAGS := debug" am: 98d261c0a1 am: fd2a17c268Dan Willemsen2019-01-222-2/+0
|\| | | | |
| * | | | | Merge "Remove LOCAL_MODULE_TAGS := debug" am: 98d261c0a1Dan Willemsen2019-01-222-2/+0
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Merge "Remove LOCAL_MODULE_TAGS := debug"Dan Willemsen2019-01-222-2/+0
| | |\| |
| | | * | Merge "Remove LOCAL_MODULE_TAGS := debug"Treehugger Robot2019-01-232-2/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * Remove LOCAL_MODULE_TAGS := debugDan Willemsen2019-01-192-2/+0
| | | |/
* | | | Remove DeviceConfigJim Kaye2018-11-0560-1637/+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 MERGE...Bill Yi2018-10-240-0/+0
| |\| |