aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| | |\
* | | | Explicitly include log/log.h instead of cutils/log.h am: 2e57a3019b am: df18e...Sasha Smundak2019-01-314-4/+4
|\| | |
| * | | Explicitly include log/log.h instead of cutils/log.h am: 2e57a3019bSasha Smundak2019-01-314-4/+4
| |\| | | | |/ | |/|
| | * Explicitly include log/log.h instead of cutils/log.hSasha Smundak2019-01-314-4/+4
| | |\
| | | * Explicitly include log/log.h instead of cutils/log.handroid-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-releaseSasha Smundak2019-01-314-4/+4
* | | | [automerger skipped] DO NOT MERGE am: 1bcb0ea0e0 -s ours am: 93e65daee9 -s ...Xin Li2018-12-100-0/+0
|\| | |
| * | | [automerger skipped] DO NOT MERGE am: 1bcb0ea0e0 -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.8android-o-mr1-iot-release-1.0.7Xin Li2018-12-070-0/+0
| | |/|
| | | * Snap for 4633189 from f314bba6e9665c4789000447ee5d668f5481e99c 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-03-052-2/+2
| | | |\
| | | * \ Snap for 4533842 from 154ca5c8cbac93d717237ea421e1549d0b70b86f to pi-releaseandroid-build-team Robot2018-01-091-0/+5
| | | |\ \
| | | * \ \ Snap for 4507345 from f50d711795a541515fd01b10529a2bfe5701cae9 to pi-releaseandroid-build-team Robot2017-12-170-0/+0
| | | |\ \ \
| | | * \ \ \ Merge cherrypicks of [3373038, 3372799] into pi-releaseandroid-build-team Robot2017-12-151-1/+1
| | | |\ \ \ \
| | | | * | | | Fix compiler warning.Chih-Hung Hsieh2017-12-151-1/+1
| | | |/ / / /
| | | * | | | Snap for 4496165 from 92cbe3cd0e47771f0fc8e3349ca87a9aa172bb25 to pi-releaseandroid-build-team Robot2017-12-110-0/+0
| | | |\ \ \ \
| | | * \ \ \ \ Snap for 4439972 from 0b88db497d350e4930343e80ea205c249a2981f4 to pi-releaseandroid-build-team Robot2017-11-080-0/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Snap for 4428213 from 0f82b371498995d24aa4cf8c577e6535b81ddd7a to pi-releaseandroid-build-team Robot2017-11-010-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Snap for 4402171 from f78c87ff704368f1e8162c7f518429c846c929be to pi-releaseandroid-build-team Robot2017-10-181-5/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Snap for 4393550 from 86d9373768e685c98324f67e3c9a0cac75c9f56b to pi-releaseandroid-build-team Robot2017-10-131-1/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Snap for 4375922 from 069265ff5a06a83030d902bea0852425c89bbce6 to pi-releaseandroid-build-team Robot2017-10-041-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Snap for 4373608 from 19d07c06f4dc6a3a2522eba9fcfd6702baaae06e to pi-releaseandroid-build-team Robot2017-10-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-43701...android-build-team Robot2017-09-3016-13/+70
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ release-request-b45781ff-b719-488b-ad10-06b90910709b-for-git_pi-release-43442...android-build-team Robot2017-09-182-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-42698...android-build-team Robot2017-08-132-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-999b130a-24cf-4106-967e-4713076535ff-for-git_pi-release-42577...android-build-team Robot2017-08-091-1/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Merge Android Pie into master am: 86c8915169 am: 8b8636cba6 am: 5f3cf91de4Xin Li2018-08-080-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge Android Pie into master am: 86c8915169 am: 8b8636cba6Xin Li2018-08-070-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge Android Pie into master am: 86c8915169android-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-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-fcsXin Li2018-08-070-0/+0
| |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li2018-08-062-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: ee355a6599Xin Li2018-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
|/| | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-082-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Reformat Android.bp file am: 773135272c am: b4890d76efandroid-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-devLogan Chien2018-03-052-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Reformat Android.bp file am: 773135272cLogan Chien2018-03-052-2/+2
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Reformat Android.bp fileLogan Chien2018-03-052-2/+2
| | |\| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Reformat Android.bp fileandroid-wear-p-preview-2android-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-7Logan Chien2018-02-272-2/+2
* | | | | | | | | | | | | | | | | Ignore -Wformat warning am: 0423b367f5 am: 3bdbe4bdc5Yi Kong2018-01-081-0/+5
|\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Ignore -Wformat warning am: 0423b367f5Yi Kong2018-01-081-0/+5
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Ignore -Wformat warningYi Kong2018-01-081-0/+5
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Ignore -Wformat warningandroid-wear-8.0.0_r1Yi Kong2018-01-031-0/+5
* | | | | | | | | | | | | | | | Fix compiler warning. am: df52de7a3a am: 12cad722ecChih-Hung Hsieh2017-12-151-1/+1
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix compiler warning. am: df52de7a3aChih-Hung Hsieh2017-12-151-1/+1
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix compiler warning.Chih-Hung Hsieh2017-12-151-1/+1
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix compiler warning.Chih-Hung Hsieh2017-12-141-1/+1
* | | | | | | | | | | | | | | Manually merge changes from giant AOSP topicStephen Li2017-12-070-0/+0
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | DO NOT MERGE: Merge Oreo MR1 into master am: ece867c88c -s oursXin Li2017-12-070-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
| | |\| | | | | | | | | | |