aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark ab/7061308 as merged in stage.HEADandroid-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-4Xin Li2021-02-200-0/+0
|\
| * add crosvm to com.android.virt am: 891be28da6 am: 006e3bcf38Jiyong Park2020-12-151-0/+4
| |\
| * \ Mark ab/6881855 as merged am: 1caece3f9fXin Li2020-11-240-0/+0
| |\ \
| * \ \ [automerger skipped] Skip ab/6749736 in stage. am: b56c7afa10 -s ours am: 57c...Xin Li2020-10-090-0/+0
| |\ \ \
| | * \ \ [automerger skipped] Skip ab/6749736 in stage. am: b56c7afa10 -s oursXin Li2020-10-090-0/+0
| | |\ \ \
* | | \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138Bob Badour2021-02-161-0/+31
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [LSC] Add LOCAL_LICENSE_KINDS to external/libepoxyandroid-s-preview-1Bob Badour2021-02-121-0/+31
* | | | | | add crosvm to com.android.virt am: 891be28da6Jiyong Park2020-12-151-0/+4
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | add crosvm to com.android.virtJiyong Park2020-12-141-0/+4
|/ / / /
* | | / Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\| | | | |_|/ |/| |
| * | ANDROID: Add target/device support am: 3189a094b2 am: 826b368df6 am: e8248eb7...Alistair Delva2020-09-011-1/+2
| |\|
| | * ANDROID: Add target/device support am: 3189a094b2 am: 826b368df6 am: e8248eb7f7Alistair Delva2020-09-011-1/+2
| | |\
| | | * ANDROID: Add target/device support am: 3189a094b2 am: 826b368df6Alistair Delva2020-09-011-1/+2
| | | |\
| * | | | [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| |\| | |
| | * | | [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | |\| |
| | | * | [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | | |\ \
| * | | | | Add Android host build for libepoxy am: a428139a81 am: 97d96203c4 am: a5b7500...Alistair Delva2020-07-268-13/+158094
| |\| | | |
| * | | | | Upgrade libepoxy to 1.5.4 am: 4679a806bd am: 4b204d7bfe am: 1c524efcbe am: 3d...Haibo Huang2020-04-105-290/+2398
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801db am: d7e6...Bob Badour2020-03-261-1/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add Android host build for libepoxy am: a428139a81 am: 97d96203c4 am: a5b7500daeAlistair Delva2020-07-268-13/+158094
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Add Android host build for libepoxy am: a428139a81 am: 97d96203c4Alistair Delva2020-07-268-13/+158094
| | |\ \ \ \ \
| * | | | | | | Upgrade libepoxy to 1.5.4 am: 4679a806bd am: 4b204d7bfe am: 1c524efcbeHaibo Huang2020-04-105-290/+2398
| |\| | | | | | | | |_|_|_|/ / | |/| | | | |
| * | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801db am: d7e6...Bob Badour2020-03-261-1/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | ANDROID: Add target/device support am: 3189a094b2Alistair Delva2020-09-011-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | ANDROID: Add target/device supportAlistair Delva2020-08-311-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li2020-08-270-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Upgrade libepoxy to 1.5.4 am: 4679a806bd am: 4b204d7bfeHaibo Huang2020-04-105-290/+2398
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801dbBob Badour2020-03-261-1/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | [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
| |\ \ \ \
| * \ \ \ \ Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78 am: b51a87e313 a...Haibo Huang2019-09-134-6/+16
| |\ \ \ \ \
| * \ \ \ \ \ Initial merge of libepoxy from upstream am: 174d119401 am: 49fce7a189 am: 377...Greg Hartman2019-07-1678-0/+64888
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Add Android host build for libepoxy am: a428139a81Alistair Delva2020-07-268-13/+158094
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add Android host build for libepoxyAlistair Delva2020-07-218-13/+158094
|/ / / / / / /
* | | | | | | Upgrade libepoxy to 1.5.4 am: 4679a806bdandroid-r-beta-3android-r-beta-2Haibo Huang2020-04-105-290/+2398
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Upgrade libepoxy to 1.5.4Haibo Huang2020-04-105-290/+2398
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #211 from gurchetansingh/masterEric Anholt2019-11-054-286/+2394
| | |\ \ \ \ \ \
| | | * | | | | | Merge branch 'khronos-registry' into HEADGurchetan Singh2019-09-234-286/+2394
| | |/| | | | | |
| | | * | | | | | Update OpenGL/EGL registriesGurchetan Singh2019-09-234-1809/+6563
* | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801dbBob Badour2020-03-261-1/+0
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Remove redundant NOTICE symbolic link. am: 3df6589272Bob Badour2020-03-261-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * / / / / / Remove redundant NOTICE symbolic link.Bob Badour2020-03-251-1/+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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78 am: b51a87e313 a...Haibo Huang2019-09-134-6/+16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78 am: b51a87e313Haibo Huang2019-09-134-6/+16
|/| | | | | | |/ / / /