summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r4android-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
| | |\
* | | | Merge "Add default code reviewers into OWNERS" am: 7b79d9b740 am: 652a17c178Chih-hung Hsieh2019-01-171-0/+4
|\| | |
| * | | Merge "Add default code reviewers into OWNERS" am: 7b79d9b740Chih-hung Hsieh2019-01-171-0/+4
| |\| | | | |/ | |/|
| | * Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-171-0/+4
| | |\
| | | * Merge "Add default code reviewers into OWNERS"android-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-171-0/+4
| | | |\
| | | | * Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-151-0/+4
| | | |/
* | | | [automerger skipped] Merge "DO NOT MERGE" am: 84ef44b885 -s ours am: 47416ec...Xin Li2018-12-100-0/+0
|\| | |
| * | | [automerger skipped] Merge "DO NOT MERGE" am: 84ef44b885 -s oursXin Li2018-12-100-0/+0
| |\| |
| | * | [automerger skipped] Merge "DO NOT MERGE"Xin Li2018-12-100-0/+0
| | |\|
| | | * Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot2018-12-100-0/+0
| | |/|
| | | * DO NOT MERGEXin Li2018-12-070-0/+0
| | |/|
| | | * Snap for 4598635 from 6d726dbcca7d0b5d1f8b338bc0279539c2b9deb0 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_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-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_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-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_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-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_r61android-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-02-111-0/+1
| | | |\
| | | * \ Snap for 4574286 from dce6a114229a6ecf183a45ef9f95e3147afdb07a to pi-releaseandroid-build-team Robot2018-01-307-7/+13
| | | |\ \
| | | * \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | |\ \ \
| | | | * \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Snap for 4557233 from f382f94d6b828304b3af8510a2f68befa9dd0014 to pi-releaseandroid-build-team Robot2018-01-211-0/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Snap for 4531101 from 658430de89312bb75ee272166d0a6cbebf90200e to pi-releaseandroid-build-team Robot2018-01-074-0/+4
| | | |\ \ \ \
| | | * \ \ \ \ Snap for 4517567 from 113145a101873f99f881fcf48f412cf04c9b57cc to pi-releaseandroid-build-team Robot2017-12-241-12/+5
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Snap for 4496165 from 0d4d2a04a2a1d746440621e72eb96a42c4d77b22 to pi-releaseandroid-build-team Robot2017-12-110-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Snap for 4453288 from 935fcd84eabdf5da7fd9215bd7cdccc7eac15887 to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Snap for 4437123 from 79990100551d3080ac89e4e0e5ffd8c486d34a06 to pi-releaseandroid-build-team Robot2017-11-071-0/+9
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Snap for 4402171 from fb594f1bd833d7dfe990c032f2a4cc97864a6fb0 to pi-releaseandroid-build-team Robot2017-10-1821-0/+7142
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-43675...android-build-team Robot2017-09-2920-7198/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-42698...android-build-team Robot2017-08-131-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: 57d7ec8d9e am: 53123eab39 am: 4a1d6...Xin Li2018-08-080-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Merge Android Pie into master" am: 57d7ec8d9e am: 53123eab39Xin Li2018-08-070-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Merge Android Pie into master" am: 57d7ec8d9eandroid-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-r39android-o-mr1-iot-release-smart-display-r30android-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-releaseXin Li2018-08-070-0/+0
| |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge Android Pie into master"android-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-0730-72/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-0630-72/+24
| | | |/| | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix the libbt-vendor build on wear-masterAlexey Polyudov2018-07-242-2/+2
* | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 06257be6e4Xin 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-0830-72/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | bt: add -Wno-error flag to bypass compilation errors.android-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-devAlain Vongsouvanh2018-02-081-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Make libbt-vendor build with the VNDK.Steven Moreland2018-01-257-7/+13
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Don't use the STL in C projects.Shijian Li2018-01-181-0/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge "Add -Wno-error to compile with global -Werror." am: 78628913ee am: dd5...Chih-Hung Hsieh2018-01-054-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Merge "Add -Wno-error to compile with global -Werror." am: 78628913eeChih-Hung Hsieh2018-01-054-0/+4
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Add -Wno-error to compile with global -Werror."Chih-Hung Hsieh2018-01-054-0/+4
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Add -Wno-error to compile with global -Werror."android-wear-p-preview-2android-wear-8.0.0_r1android-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-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot2018-01-054-0/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add -Wno-error to compile with global -Werror.Chih-Hung Hsieh2018-01-044-0/+4
| | | |/ / / / / / / /
* | | | | | | | | | / Merge "build warnings" am: 90f3dcf315 am: ff1995bbe9Mark Salyzyn2017-12-211-12/+5
|\| | | | | | | | | | | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge "build warnings" am: 90f3dcf315Mark Salyzyn2017-12-201-12/+5
| |\| | | | | | | |
| | * | | | | | | | Merge "build warnings"Mark Salyzyn2017-12-201-12/+5
| | |\| | | | | | |
| | | * | | | | | | Merge "build warnings"Treehugger Robot2017-12-201-12/+5
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | build warningsMark Salyzyn2017-12-201-12/+5
| | | |/ / / / / / /
* | | | | | | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: c8fdc0c131 -s ours am: ...Xin Li2017-12-080-0/+0
|\| | | | | | | | |