summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterHEADq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-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_r12q_tzdata_aml_297100000mastermainandroid12-mainline-tzdata-releaseandroid10-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-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 4011233621 -s ours am skip reason: subject contains skip directive Change-Id: I97b63ccbd7e0260bfafedd4a20a4c119b9433213
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: I26a115428fbae78985ae0f2f38f53a277be2d2c9
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
MERGE am: da1f8b2414 -s ours am: 004c9086f9 -s ours am: b5fcd10c8f -s ours Change-Id: I069a28277481ca39e29cf60378d949228ef85c25
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: da1f8b2414 -s ours am: 004c9086f9 -s ours Change-Id: I1ba9ea3d6258ba63df7af2cd5fe7626cf2931c9b
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: da1f8b2414 -s ours Change-Id: Ic6dbf96981dea912329c9cc75320d733205a0ee3
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-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-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseBill Yi
Change-Id: I83462fbe242dfee9a58ddb61ff0b40e7bc9ac6f2
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: f387ac20cd -s ours am: 317e5f1d75 -s ours Change-Id: Id2c7871e6b5689e9f45e9384060fcf7f8b1db4b1
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: f387ac20cd -s ours Change-Id: Iffc3769407b9928fcee5f375dd2a229ab3cbbb1d
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I937a54074ea263b36de057ffe5aa687a3d7bb358
2018-08-08Merge "Put back gradle 2.2" am: 1ec64f4d17 am: 8539d6ae4c am: 9420e5bc14Lingfeng Yang
am: 702011d2d4 Change-Id: I70bed63ae63a8b76ae73358773cbf615c838c2ae
2018-08-08Merge "Put back gradle 2.2" am: 1ec64f4d17 am: 8539d6ae4cLingfeng Yang
am: 9420e5bc14 Change-Id: I3ad0a6b82f500c244e9be9241fa10a16f6226b73
2018-08-08Merge "Put back gradle 2.2" am: 1ec64f4d17Lingfeng Yang
am: 8539d6ae4c Change-Id: If9f9adf9025d8be77cf09641acbf2d1ddc65518e
2018-08-08Merge "Put back gradle 2.2"Lingfeng Yang
am: 1ec64f4d17 Change-Id: Iced91ade7b94596914dbd53e12893b9990339ff1
2018-08-08Merge "Merge Android Pie into master" am: b3fdddca50 am: db9c78784e am: ↵Xin Li
c803bae45c am: dcad1bb64d Change-Id: Ibf85e2b9e2ccfcdea32d53e7fdc0db71cd3dd06b
2018-08-07Merge "Merge Android Pie into master" am: b3fdddca50 am: db9c78784eXin Li
am: c803bae45c Change-Id: I8b5a0bad4aefe75ff32c041608e6bd4c3860bfbd
2018-08-07Merge "Merge Android Pie into master" am: b3fdddca50Xin Li
am: db9c78784e Change-Id: Id087f4069e7606cc453280389d66d9cbe1bd2163
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: b3fdddca50 Change-Id: Ida25cc1427f3ad38e84647454dfd9f74267b3065
2018-08-07Merge "Put back gradle 2.2"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-releaseTreehugger Robot
2018-08-07Put back gradle 2.2Lingfeng Yang
bug: 112314864 Change-Id: I2d9a14256d175d0d5668203a2e7e23729bd05375
2018-08-07Merge "Merge Android Pie into master"Xin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: I869d7c636cba5ecd4bfacffc04b5f0bf86b10c7b
2018-07-11Merge "Remove chiur from OWNERS" am: e9395a3fdf am: 4a24a32a1aandroid-n-iot-release-smart-display-r2Raymond Chiu
am: b2b04a2eef Change-Id: I48fd1a284a77e8adbb27eb93df11df0f50c1ba50
2018-07-11Merge "Remove chiur from OWNERS" am: e9395a3fdfRaymond Chiu
am: 4a24a32a1a Change-Id: I3f7cc67930a5664401357f4a525fd98ca09e8bee
2018-07-11Merge "Remove chiur from OWNERS"temp_p_mergeRaymond Chiu
am: e9395a3fdf Change-Id: Ic8f499d7985035ea0022146bfa15eea7901532ac
2018-07-11Merge "Remove chiur from OWNERS"android-p-preview-5Raymond Chiu
2018-06-11Remove chiur from OWNERSRaymond Chiu
Test: none Change-Id: I2b10c0cfd5d2d4c744b28fbb9a0144be7cf53321
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 62a6bab8ddandroid-n-iot-release-smart-displayXin Li
am: 6ec1d91c77 Change-Id: I26f65e0098dba3d64257ebecab643528e0eb7e76
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 62a6bab8dd Change-Id: I87ecb76dccd5b8f20d1f8f521de984823456b26e
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: If0c1a0d12f8d12b8d72569d9c456373d818d684a
2017-12-19Snap for 4509671 from 6eb26c8667a7bc0d57a40433c42c2cdbfc057004 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: Ic63e9033e7beabb7d8aa742536a27f84ed099523
2017-12-18Add Gradle 4.4 prebuilts.android-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-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-devAurimas Liutikas
Test: None Change-Id: I5895d69bc987c6bab027286b4582f3b8a3b5ed59
2017-12-11Snap for 4496165 from 0a09fb6b9d4b5c7b9e506a30018cf261c09a6958 to pi-releaseandroid-build-team Robot
Change-Id: I7643d0d19e759a2cade4745b550a3ca5c884b23d
2017-12-08Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 770d6ed9ff -s ours am: ↵Xin Li
f86efec220 am: d6055b89a0 -s ours Change-Id: Ic890106c18378584081b9209ae261dab6726438c
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: I00f03fe10e21f05576b7ed0910275e1a58ba8882
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 770d6ed9ff -s oursXin Li
am: f86efec220 Change-Id: Id81bd62ac38b067ccc6f767a14e837890838ca45
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
am: 770d6ed9ff -s ours Change-Id: If36de345980263407ac6273e0ac4663c06ed37a0
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: 639337f87f -s oursXin Li
am: 07b519b1f8 Change-Id: I73899e448d81c82859718f33078756bda3929bee
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
am: 639337f87f -s ours Change-Id: I9aad45d549d4bb94768e3bcab3564d716242b7a8
2017-12-06Merge "DO NOT MERGE: Merge Oreo MR1 into master"android-wear-p-preview-2android-wear-8.0.0_r1android-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-7emu-2.8-releaseemu-2.7-releaseXin Li
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterXin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I6fc328414389485a3a26cb11e2792926c429f3b7
2017-11-01Snap for 4428213 from 8e67c75cc1e601ee55925f5d8bd73d98036ad5da to pi-releaseandroid-build-team Robot
Change-Id: Id126ff5ae3f580d79d1e1790577c0afadb6cb15d
2017-10-30Add gradle 4.3 prebuilt.Aurimas Liutikas
Test: None
2017-10-03Snap for 4373608 from 94e08bdd4fe5debcef5325713f095ead86ec77be to pi-releaseandroid-build-team Robot
Change-Id: I114be7ad6d4c39d37d7330408077c2762bcde8f7
2017-08-23Merge "Add Gradle 4.1 binary." am: f055ebc3d4 am: d6ba59d837 am: 9173f73ff3 ↵Xavier Ducrohet
am: 4aa9511196 am: 6db0e7fc93 Change-Id: I1f0a92eb2215273a4be0a377ae48997d70355445
2017-08-23Merge "Add Gradle 4.1 binary." am: f055ebc3d4 am: d6ba59d837 am: 9173f73ff3Xavier Ducrohet
am: 4aa9511196 Change-Id: Id5c56bee9e62805acc02ea2559a980d89bb34e3d
2017-08-23Merge "Add Gradle 4.1 binary." am: f055ebc3d4 am: d6ba59d837android-o-mr1-iot-preview-6o-mr1-iot-preview-6Xavier Ducrohet
am: 9173f73ff3 Change-Id: Id80d1351dfd37be72fad92bd93413ef61a05095d
2017-08-23Merge "Add Gradle 4.1 binary." am: f055ebc3d4Xavier Ducrohet
am: d6ba59d837 Change-Id: Ibc3cdc9ee730dcb072932212c77b26ccbc6995ed
2017-08-23Merge "Add Gradle 4.1 binary."Xavier Ducrohet
am: f055ebc3d4 Change-Id: Ib5b9d7b9fc740ade54d8bb0747d94e2c94f18404
2017-08-23Merge "Add Gradle 4.1 binary."android-o-mr1-preview-2android-o-mr1-preview-1emu-2.5-releaseXavier Ducrohet
2017-08-22Add Gradle 4.1 binary.Aurimas Liutikas
Test: None Change-Id: I58a7c9b38f700afc3481809b67bd9bb6590ee305