aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-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
| | |\
* | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: eb1...Xin Li2019-02-200-0/+0
|\| | |
| * | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: eb1...Xin Li2019-02-200-0/+0
| |\| |
| | * | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-200-0/+0
| | |\ \
| | | * \ DO NOT MERGE - Merge PPRL.190205.001 into masterandroid-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-releaseXin Li2019-02-181-2/+2
| | | |\ \ | | | |/ / | | |/| |
* | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-140-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-140-0/+0
| |\| | |
| | * | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-ma...Xin Li2019-02-121-2/+2
| | |\ \ \
| | | * \ \ Snap for 5180536 from 2a49513da00436f434281a98dfb118db855db013 to pi-platform...pie-platform-releaseandroid-build-team Robot2019-02-091-2/+2
| | | |\ \ \
| | | | * \ \ Snap for 5044688 from d019345012951498cda181caed55908f7fe4f801 to pi-qpr2-rel...android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot2018-10-021-2/+2
| | | | |\ \ \
* | | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 6cccb8fde7 am: bd05e6980bDan Willemsen2019-01-224-1/+51
|\| | | | | | |
| * | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 6cccb8fde7Dan Willemsen2019-01-224-1/+51
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2019-01-224-1/+51
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2019-01-224-1/+51
| | | |\ \ \ \
| | | | * \ \ \ Merge pull request #164 from danw/top_level_phonyDan Willemsen2019-01-224-1/+51
| | | | |\ \ \ \
| | | | | * | | | Add --top_level_phonyDan Willemsen2019-01-214-1/+51
| | | | |/ / / /
* | | | | | | | Merge remote-tracking branch 'aosp/upstream' into update am: 6a94855578 am: 9...Dan Willemsen2019-01-1120-92/+112
|\| | | | | | |
| * | | | | | | Merge remote-tracking branch 'aosp/upstream' into update am: 6a94855578Dan Willemsen2019-01-1120-92/+112
| |\| | | | | |
| | * | | | | | Merge remote-tracking branch 'aosp/upstream' into updateDan Willemsen2019-01-1120-92/+112
| | |\| | | | |
| | | * | | | | Merge remote-tracking branch 'aosp/upstream' into updateDan Willemsen2019-01-1120-92/+112
| | | |\| | | |
| | | | * | | | Merge pull request #163 from danw/random_affinityDan Willemsen2019-01-111-1/+1
| | | | |\ \ \ \
| | | | | * | | | Use std::random_device instead of initializing via getpidDan Willemsen2019-01-111-1/+1
| | | | * | | | | Merge pull request #162 from Martin-Hsu/masterDan Willemsen2018-12-051-0/+1
| | | | |\ \ \ \ \
| | | | | * | | | | Fix undeclared identifier 'exit' on Mac.Martin Hsu2018-12-061-0/+1
| | | | |/ / / / /
| | | | * | | | | Merge pull request #161 from colincross/implicit_outputs_segfaultcolincross2018-11-121-1/+1
| | | | |\ \ \ \ \
| | | | | * | | | | Fix segfault when reporting implicit outputs errorColin Cross2018-11-121-1/+1
| | | | |/ / / / /
| | | | * | | | | Merge pull request #160 from danw/clang-formatDan Willemsen2018-11-0518-90/+109
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Update travis config; require clang-format to passDan Willemsen2018-11-052-2/+29
| | | | | * | | | Run clang-formatDan Willemsen2018-11-0516-88/+80
| | | | |/ / / /
* | | | | | | | [automerger skipped] DO NOT MERGE am: 679d6bb847 -s ours am: d5f699af92 -s ...Xin Li2018-12-100-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] DO NOT MERGE am: 679d6bb847 -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
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
* | | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 667d0786cf am: f6037b3fd7Dan Willemsen2018-10-311-0/+3
|\| | | | | | |
| * | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 667d0786cfDan Willemsen2018-10-311-0/+3
| |\| | | | | |
| | * | | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2018-10-311-0/+3
| | |\| | | | |
| | | * | | | | Merge remote-tracking branch 'aosp/upstream'android-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-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseDan Willemsen2018-10-301-0/+3
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Merge pull request #156 from danw/regen_affinityDan Willemsen2018-10-301-0/+3
| | | | |\ \ \ \
| | | | | * | | | Improve regen performance by setting cpu affinityDan Willemsen2018-10-301-0/+3
| | | | |/ / / /
* | | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 2de6712ec4 am: e3a8287fe6Dan Willemsen2018-10-264-9/+15
|\| | | | | | |
| * | | | | | | Merge remote-tracking branch 'aosp/upstream' am: 2de6712ec4Dan Willemsen2018-10-264-9/+15
| |\| | | | | |
| | * | | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2018-10-264-9/+15
| | |\| | | | |
| | | * | | | | Merge remote-tracking branch 'aosp/upstream'Dan Willemsen2018-10-264-9/+15
| | | |\| | | |
| | | | * | | | Merge pull request #155 from danw/empty_ninja_fileDan Willemsen2018-10-263-4/+11
| | | | |\ \ \ \
| | | | | * | | | Add --empty_ninja_file for test usecasesDan Willemsen2018-10-263-4/+11
| | | | |/ / / /
| | | | * | | | Merge pull request #151 from google/danw-readme-updateDan Willemsen2018-10-161-5/+4
| | | | |\ \ \ \
| | | | | * | | | Update README.mdDan Willemsen2018-10-161-5/+4
| | | | |/ / / /
* | | | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
|\| | | | | | |