aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-084-3/+7065
|\
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-274-3/+7065
|/|
| * Fix bounds check in ipp am: 239ddbfc0cBryan Ferris2020-04-302-1/+2
| |\
| | * Fix bounds check in ippandroid11-devBryan Ferris2020-04-292-1/+2
| * | Hotfix for CVE-2020-3898 am: daaca9ec18Philip P. Moltmann2020-04-292-2/+10
| |\|
| | * Hotfix for CVE-2020-3898Philip P. Moltmann2020-04-282-2/+10
| * | Add license type: contains GPL = RESTRICTED license am: 0731548b21 am: 46f005...Bob Badour2020-04-241-0/+1
| |\ \ | |/ / |/| |
* | | Add license type: contains GPL = RESTRICTED license am: 0731548b21android-r-beta-3android-r-beta-2Bob Badour2020-04-241-0/+1
|\ \ \
| * | | Add license type: contains GPL = RESTRICTED licenseBob Badour2020-04-231-0/+1
| | * | expand MITM protection to printers supporting TLS upgrades am: 645a9d3d96Glade Diviney2020-04-170-0/+0
| | |\|
| | | * expand MITM protection to printers supporting TLS upgradesGlade Diviney2020-04-171-0/+2
| | * | expand MITM protection to printers supporting TLS upgrades am: bf559862a8 am:...Glade Diviney2020-04-171-0/+2
| | |\ \ | |_|/ / |/| | |
* | | | expand MITM protection to printers supporting TLS upgrades am: bf559862a8Glade Diviney2020-04-171-0/+2
|\| | |
| * | | expand MITM protection to printers supporting TLS upgradesGlade Diviney2020-04-171-0/+2
| | * | [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
|\ \ \ \
| * \ \ \ Upgrade libcups to v2.3.1 am: 4c28362030 am: 4a3a54af23Haibo Huang2020-04-091302-10312/+810145
| |\ \ \ \ | |/ / / / |/| | | |
| | | * | Upgrade libcups to v2.3.1 am: 4c28362030 am: 4a3a54af23Haibo Huang2020-04-091302-10312/+810145
| | | |\ \ | |_|_|/ / |/| | | / | | | |/
* | | | Upgrade libcups to v2.3.1 am: 4c28362030Haibo Huang2020-04-091302-10312/+810145
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / Upgrade libcups to v2.3.1Haibo Huang2020-04-091302-10312/+810145
|/ /
| * Merge Android10 QPR1 into AOSP master am: bc263e03c1 am: 2b54628abfAutomerger Merge Worker2019-12-040-0/+0
| |\ | |/ |/|
* | Merge Android10 QPR1 into AOSP master am: bc263e03c1Xin Li2019-12-040-0/+0
|\ \
| * \ Merge Android10 QPR1 into AOSP masterXin Li2019-12-030-0/+0
| |\ \
| | * \ Merge Android10 QPR1 into AOSP masterXin Li2019-12-0269-1486/+2630
| | |\ \ | | |/ / | |/| |
| | | * [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-310-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-310-0/+0
|\| | |
| * | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-3069-1486/+2630
| |\ \ \ | | |/ / | |/| |
| | | * Skip QD1A.190821.011 in stage-aosp-master am: e87320d04c am: 99d5a62387Xin Li2019-10-160-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Skip QD1A.190821.011 in stage-aosp-master am: e87320d04cXin Li2019-10-160-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| |\| |
| | * | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| | |\ \
| | | * \ Snap for 5691653 from bf63712c8f57f1dd2769026bd2a3108f9788d0cb to qt-c2f2-rel...android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot2019-06-271-7/+2
| | | |\ \
| | | | | * [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...android-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_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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseBryan Ferris2019-09-260-0/+0
| |\ \ \ \ \ \
| | | | | | | * [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa39...Bryan Ferris2019-09-260-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 2c0dfa3920Bryan Ferris2019-09-260-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Update libcups to v2.2.9 RESTRICT AUTOMERGEBryan Ferris2019-09-2695-3775/+6816
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Update libcups to v2.2.9 RESTRICT AUTOMERGEBryan Ferris2019-08-0595-3775/+6816
| | | | | | | | | | | | * [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 1d296f84...Bryan Ferris2019-09-260-0/+0
| | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 1d296f84...Bryan Ferris2019-09-260-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 1d296f84...Bryan Ferris2019-09-260-0/+0
| |\| | | | | | | | | | |
| | | | | | | | | | | | * Merge "[automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 1...Bryan Ferris2019-09-260-0/+0
| | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "[automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 1...Android Build Merger (Role)2019-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Update libcups to v2.2.9 RESTRICT AUTOMERGE am: 1d296f84...Bryan Ferris2019-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 20:49:24 +0000