summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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_r45android-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_r48android-11.0.0_r47android-11.0.0_r46android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 78bcfe5b90 am: 60cd73f453 -s ours am skip reason: subject contains skip directive Change-Id: Iefabd0b03ca12797cce14875a90ade3bde0b3398
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 78bcfe5b90 Change-Id: I798984ff3aa4bae44643f42416009bfcc9931bfd
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I683c461dc40d0a3c9dde64d8abb2ab0591a9fba9
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2ddd0fcff0 -s ours am: 868acf3ead -s ours am: 6be6d32a1e -s ours am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history Change-Id: I1d5aed1bba431562bfeb76b8113595b68d43f97c
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2ddd0fcff0 -s ours am: 868acf3ead -s ours am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history Change-Id: Idec32f127ab8f7c2fd3a56cd25769a771364471c
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 2ddd0fcff0 -s ours am skip reason: change_id I3d98bd70a659cad37d520fb0e7ecd631f622e8fb with SHA1 e56141599a is in history Change-Id: Ib5d319e0a34f6ade941e4077f702b065fe338d3d
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I1dfed5105490d27692d9db5e0217c29f91c30728 Merged-In: I3d98bd70a659cad37d520fb0e7ecd631f622e8fb
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
cdd572677e -s ours am: c4f1af81bb am: f3f950ee1e am: 98487c8d25 -s ours am skip reason: subject contains skip directive Change-Id: I36ce39f65a2d5552e30a8b03867991dc633ad431
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
cdd572677e -s ours am: c4f1af81bb am: f3f950ee1e Change-Id: I8ba268322af8e9dd55fe3dfa56cae80fc55be04c
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
cdd572677e -s ours am: c4f1af81bb Change-Id: Iddad152bb26595f3cf077cc0ad7b17a0bcee4196
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: cdd572677e -s ours am skip reason: subject contains skip directive Change-Id: I5cb1d70e391d148dcd24fc459e94e6c6a5cde84e
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I3d98bd70a659cad37d520fb0e7ecd631f622e8fb
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 254d13edf6 am: 3f16bebff0 -s ours am skip reason: subject contains skip directive Change-Id: I0b8c0bb303f3931f3a021f88f785eccd24538a56
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 254d13edf6 Change-Id: Ie6b328a31658515afdfeac62e8b21814b2880b6d
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I63b5e97a7f3a893ccf9bfe15694d3f3f459bf8f5
2019-02-25Merge 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-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 Li
am: f78410c5ea Change-Id: Ic9054251b98264776249e6c16f51265a2efe9e10
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I74cb93a460c0ec02a11b222072c07941cbff21d8
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: If3932ab0f6716b8df130153b6f92c0a5a13f59f1
2019-01-17Merge "Add default code reviewers into OWNERS" am: 7b79d9b740 am: 652a17c178Chih-hung Hsieh
am: d3a3166bd4 Change-Id: I58e67d905fd603f57a836b34d6faa6979044e4a4
2019-01-17Merge "Add default code reviewers into OWNERS" am: 7b79d9b740Chih-hung Hsieh
am: 652a17c178 Change-Id: I1ad5c83bdc542ec012269cb70dde49b7ca20fd6b
2019-01-17Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 7b79d9b740 Change-Id: Ie89a34b54d0faca56258367f77520f7d454c8cae
2019-01-17Merge "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 Hsieh
2019-01-15Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I5ad38887566097e26a45acd551a28241b9506944
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 84ef44b885 -s ours am: ↵Xin Li
47416ec8f1 -s ours am: d47ccaf350 -s ours Change-Id: Ie078775bcb62f249cd9016b8797fe23bc80f80ad
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 84ef44b885 -s oursXin Li
am: 47416ec8f1 -s ours Change-Id: I81b829ce1b0f8c51b1db7f8995b7be55bf984525
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: 84ef44b885 -s ours Change-Id: Ib0e87250a3abae5d4280b05ccf7ed6fa2a5fe9f9
2018-12-10Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I416d37d06cb01952b5806176b6a8ede19a7c2b56
2018-08-08Merge "Merge Android Pie into master" am: 57d7ec8d9e am: 53123eab39 am: ↵Xin Li
4a1d617d2b am: 1d06317796 Change-Id: I724d549eebf997c561f1a083ab191c3e976568af
2018-08-07Merge "Merge Android Pie into master" am: 57d7ec8d9e am: 53123eab39Xin Li
am: 4a1d617d2b Change-Id: I5fe295eeb35cec2c5755272a69653df6be4e565d
2018-08-07Merge "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-r40.1Jandroid-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-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseXin Li
am: 53123eab39 Change-Id: Icb43cec8a3289b1cc6e35fad8cb787a29c7103f8
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: 57d7ec8d9e Change-Id: Ibe25cca1fe7e86f39d87afea33f50683a20bfb42
2018-08-07Merge "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 Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: Iceb6c4b0c3ca603583759914844d20d3fdc0c3f3
2018-07-24Fix the libbt-vendor build on wear-masterAlexey Polyudov
Bug: 111801028 Change-Id: I8c51c2ffe5d4560cea4e17c28daf7e71e34e7aee Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 06257be6e4Xin Li
am: 5d0a2a963b Change-Id: Id46c3b090520ed578c92ebaf20c58c925c845363
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 06257be6e4 Change-Id: I8f745ff5aaa4bba75d7e127f7b0bc36ccf4e802b
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: Ia83a4eccaa93eb712806fb9c201569be7b920968
2018-02-11Snap 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_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-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_r19android-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_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-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_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-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 Robot
Change-Id: Ie13bba4e38b55cfecf9904e86e4e3eee16577a42
2018-02-08bt: 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 Vongsouvanh
BUG: 73113371 Change-Id: I50806d3a8a49c6cc12bc1eca891b330bb2112299
2018-01-30Snap for 4574286 from dce6a114229a6ecf183a45ef9f95e3147afdb07a to pi-releaseandroid-build-team Robot
Change-Id: I3f9db3bbc9cb7cdb0fe193e12977943548702e15
2018-01-25Make libbt-vendor build with the VNDK.Steven Moreland
When the vndk is enabled (BOARD_VNDK_VERSION=current), vendor libraries must only link against vendor variants in the build system. This also means that they receive restricted sets of headers and that automatic global headers are restricted. Test: build libbt-vendor with BOARD_VNDK_VERSION=current Bug: 69526027 Change-Id: I2ff78cccc417d0fff8cacb8b82fa8dc3d6f074ab
2018-01-22merge in pi-release history after reset to mastergitbuildkicker
2018-01-22merge in pi-release history after reset to mastergitbuildkicker
2018-01-21Snap for 4557233 from f382f94d6b828304b3af8510a2f68befa9dd0014 to pi-releaseandroid-build-team Robot
Change-Id: If4f08baf096f5a951bfa5bd8e515dc370976965c
2018-01-18Don't use the STL in C projects.Shijian Li
Bug: 72138732 Change-Id: I18431ad0f93bc34825faacdc59b6ea66bbf757b2
2018-01-07Snap for 4531101 from 658430de89312bb75ee272166d0a6cbebf90200e to pi-releaseandroid-build-team Robot
Change-Id: I1e29647fcf292da82482271e0968556446507828
2018-01-05Merge "Add -Wno-error to compile with global -Werror." am: 78628913ee am: ↵Chih-Hung Hsieh
dd543379de am: 69c30a4488 Change-Id: Ib09e3690fe7b6bff6ccfe5893c41cfe828896e23
2018-01-05Merge "Add -Wno-error to compile with global -Werror." am: 78628913eeChih-Hung Hsieh
am: dd543379de Change-Id: I3d00705d5e6da08d34d050b28c8fc10b8bd4c2ed
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 15:11:41 +0000