summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11HEADmasterDan Shi2020-04-281-1/+1
|\
| * Correct license header of ply to AOSP am: 9eb1e198eeandroid-r-beta-3android-r-beta-2Dan Shi2020-04-281-1/+1
| |\
| | * Correct license header of ply to AOSPDan Shi2020-04-281-1/+1
* | | [automerger skipped] Enable ply an importable module. am: edb5967727 -s oursJim Tang2020-04-280-0/+0
|\ \ \
| * | | Enable ply an importable module.android11-devJim Tang2020-04-281-0/+30
* | | | Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95Jim Tang2020-04-201-0/+30
|\ \ \ \ | | |/ / | |/| |
| * | | Enable ply an importable module. am: 0b5a27fb00Jim Tang2020-04-201-0/+30
| |\ \ \ | | | |/ | | |/|
| | * | Enable ply an importable module.Jim Tang2020-04-151-0/+30
* | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
|\| | |
| * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ \
| | * \ \ Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37effBob Badour2020-03-261-30/+0
| | |\ \ \ | | |/ / / | |/| | |
* | | | | Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37effBob Badour2020-03-261-30/+0
|\| | | | | |_|_|/ |/| | |
| * | | Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464Bob Badour2020-03-261-30/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * Remove redundant NOTICE copied from LICENSE.Bob Badour2020-03-251-30/+0
| |/
* | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin 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] DO NOT MERGE - Merge Android 10 into master am: 2356825d...Xin Li2019-09-050-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 2356825d...Xin Li2019-09-050-0/+0
| |\| | | | | |_|/ | |/| |
| | * | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 2356825d...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-0429-103/+536
| | | |\ | | | |/ | | |/|
* | | | [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-0129-103/+536
| |\ \ | |/ / |/| / | |/
* | [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-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\
* | \ Add default active developers into OWNERS am: 19842d88c1 am: fbc5f5f943Chih-Hung Hsieh2019-01-041-0/+4
|\ \ \ | | |/ | |/|
| * | Add default active developers into OWNERS am: 19842d88c1Chih-Hung Hsieh2019-01-041-0/+4
| |\|
| | * Add default active developers into OWNERSChih-Hung Hsieh2019-01-041-0/+4
| | |\
| | | * Add default active developers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-Hung Hsieh2019-01-041-0/+4
* | | | [automerger skipped] DO NOT MERGE am: 31eacf2e1b -s ours am: 67bb96c55b -s ...Xin Li2018-12-100-0/+0
|\| | |
| * | | [automerger skipped] DO NOT MERGE am: 31eacf2e1b -s oursXin Li2018-12-100-0/+0
| |\| |
| | * | [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
| |/| | | | |/
| | * DO NOT MERGEandroid-o-mr1-iot-release-1.0.7Xin Li2018-12-070-0/+0
| |/|
| | * Snap for 4455093 from 8b4275169c7b4efb46d034d409edac37b9b6df89 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 Robot2017-11-164-0/+77
| | |\ | | |/ | |/|
| | * Snap for 4415813 from 906eeff9065e7184ddc0138ccb7110703dde58af to pi-releaseandroid-build-team Robot2017-10-250-0/+0
| | |\
* | | | Upgrade PLY to version 3.11Enrico Granata2018-05-2229-103/+536
|/ / /
* | | Add required info files at the top of external/ply am: 0c26330983 am: 5b6a08a9e9android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseEnrico Granata2017-11-154-0/+77
|\ \ \ | |_|/ |/| |
| * | Add required info files at the top of external/ply am: 0c26330983Enrico Granata2017-11-154-0/+77
| |\ \
| | * \ Add required info files at the top of external/plyandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Enrico Granata2017-11-154-0/+77
| | |\ \
| | | * | Add required info files at the top of external/plyEnrico Granata2017-11-154-0/+77
* | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 5734a9be9...Bill Yi2017-10-240-0/+0
|\| | | | | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 5734a9be97Bill Yi2017-10-240-0/+0
|/| | | | |/ /
| * / Merge remote-tracking branch 'goog/stage-aosp-master' into HEADBill Yi2017-10-240-0/+0
|/| | | |/
| * Merge remote-tracking branch 'goog/stage-aosp-master' into HEADBill Yi2017-10-24171-0/+22937
| |\ | |/ |/|