summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...HEADmasterXin Li2020-04-100-0/+0
|\
| * DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li2020-04-090-0/+0
| |\
| | * Add an exported flag in manifest am: 534aee7aae am: 08f5c1e413Ashwini Oruganti2020-04-011-12/+15
| | |\ | | |/ | |/|
* | | Add an exported flag in manifest am: 534aee7aae am: 08f5c1e413Ashwini Oruganti2020-04-011-12/+15
|\| |
| * | Add an exported flag in manifest am: 534aee7aaeAshwini Oruganti2020-03-311-12/+15
| |\ \ | | |/ | |/|
| | * Add an exported flag in manifestAshwini Oruganti2020-03-231-12/+15
| |/
* | [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] DO NOT MERGE - Merge Android 10 into master am: 048a25a0...Xin Li2019-09-050-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 048a25a0...Xin Li2019-09-050-0/+0
| |\| | | | | |_|/ | |/| |
| | * | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 048a25a0...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-046-19/+19
| | | |\ | | | |/ | | |/|
* | | | [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-016-19/+19
| | |\ \ | | |/ / | |/| / | | |/
* | | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-mast...Xin Li2019-04-090-0/+0
|\| |
| * | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-04-090-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
| | |\
| | | * Fix NPE in hover event am: 844090e5c6Hyejin Kim2019-01-152-2/+8
| | | |\
| | | * \ Convert Android.mk file to Android.bp am: 70fcddde6fSasha Smundak2019-01-102-55/+46
| | | |\ \
| | | * \ \ [automerger skipped] DO NOT MERGE am: 71c274c6b9 -s oursXin Li2018-12-100-0/+0
| | | |\ \ \
| | | * \ \ \ Fix a crash in the path to auto-show the IME am: a930ca809fGuobin Zhang2018-12-061-2/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge Android Pie into master am: 73438f5333 am: 6ee9224a22Xin Li2018-08-070-0/+0
| | | |\ \ \ \ \
* | | | | | | | | Add default code reviewers into OWNERS am: 05b46ab5a6 am: 19c2af621aChih-Hung Hsieh2019-04-081-0/+5
|\| | | | | | | |
| * | | | | | | | Add default code reviewers into OWNERS am: 05b46ab5a6Chih-Hung Hsieh2019-04-081-0/+5
| |\| | | | | | |
| | * | | | | | | Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-181-0/+5
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Add default code reviewers into OWNERSandroid-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-releaseChih-Hung Hsieh2019-01-181-0/+5
* | | | | | | | | resolve merge conflicts of ee5e3f6bc9b6e937fac9b26fb3164baecac50b13 to qt-dev...Anthony Chen2019-04-082-2/+8
|\| | | | | | | |
| * | | | | | | | resolve merge conflicts of ee5e3f6bc9b6e937fac9b26fb3164baecac50b13 to qt-dev...Anthony Chen2019-04-082-2/+8
| |\| | | | | | |
| | * | | | | | | Fix NPE in hover eventHyejin Kim2019-01-152-2/+8
| | |\| | | | | | | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Fix NPE in hover eventHyejin Kim2019-01-152-2/+8
* | | | | | | | resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev...Sasha Smundak2019-04-042-53/+45
|\| | | | | | |
| * | | | | | | resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev...Sasha Smundak2019-04-042-53/+45
| |\| | | | | |
| | * | | | | | Convert Android.mk file to Android.bpSasha Smundak2019-01-102-55/+46
| | |\| | | | | | | | |_|_|_|/ | | |/| | | |
| | | * | | | Convert Android.mk file to Android.bpSasha Smundak2019-01-092-55/+46
* | | | | | | [automerger skipped] DO NOT MERGE am: 71c274c6b9 -s ours am: d74296220b -s oursXin Li2019-04-040-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] DO NOT MERGE am: 71c274c6b9 -s oursXin Li2019-04-040-0/+0
| |\| | | | |
| | * | | | | [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
| | |\| | | | | | | |_|_|/ | | |/| | |
| | | * | | DO NOT MERGEandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Xin Li2018-12-070-0/+0
| | | |\ \ \
| | | | * \ \ Snap for 4821244 from 8c19f863a25c4549d7729baaeaef8dd656a96cf3 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-06-051-2/+2
| | | | |\ \ \
| | | | * \ \ \ Snap for 4722539 from 39387e0806d01296295d1313892556ac8f44c240 to pi-releaseandroid-build-team Robot2018-04-151-3/+4
| | | | |\ \ \ \
| | | | * \ \ \ \ Snap for 4698807 from 497ca45d8744ba0bd17d802c1dff7410558989e7 to pi-releaseandroid-build-team Robot2018-04-041-2/+1
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Snap for 4677756 from 4db4661c51d6c6a260faf6fb44367676a4c6d4e5 to pi-releaseandroid-build-team Robot2018-03-251-32/+43
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Snap for 4641295 from 9bc10a43a6e5af2c75cc9511607a17e0b9c94df4 to pi-releaseandroid-build-team Robot2018-03-081-1/+3
| | | | |\ \ \ \ \ \ \