aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.android-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-releaseBill Rassieur
am: 8c3a5c5fe9 Change-Id: Ic590474be6f48550f8e897868e37eeb49130e200
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I4270e3449b0fa0a061ea5b2a4964d60db1336530 BUG: 129345239
2019-03-28Merge "Remove exclude_src from curl" am: 529e0f684e am: 3ba998c1daHaibo Huang
am: 219e272f54 Change-Id: I6cc9f7886ab3bb70b3123a2576006d7489956389
2019-03-28Merge "Remove exclude_src from curl" am: 529e0f684eHaibo Huang
am: 3ba998c1da Change-Id: I5e8371a00cf28ae2401cd96886b6553a50bcfeab
2019-03-28Merge "Remove exclude_src from curl"Haibo Huang
am: 529e0f684e Change-Id: I33cca7217557bbdd7e5cc33429ad8ccba14bbc9a
2019-03-28Merge "Remove exclude_src from curl"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-03-28Remove exclude_src from curlHaibo Huang
Test: build & boot & vendor/google/tools/fake-ota on streaming Change-Id: If5d6ca223fb4d5ee0ac88fdf30b8de85c7d73b84
2019-03-28Merge "Upgrade curl to 7.64.1" am: dce0a917b4 am: 51e73a307aHaibo Huang
am: 60ff624529 Change-Id: Idc8be70dbecac4bc4b684ed47ed41b8fa9977f5c
2019-03-28Merge "Upgrade curl to 7.64.1" am: dce0a917b4Haibo Huang
am: 51e73a307a Change-Id: I100169d9a0783c5383fe79642b94f19d337157ef
2019-03-28Merge "Upgrade curl to 7.64.1"Haibo Huang
am: dce0a917b4 Change-Id: I41c0523158510db02a5c22cde83adf2231c61c9e
2019-03-28Merge "Upgrade curl to 7.64.1"Haibo Huang
2019-03-27Upgrade curl to 7.64.1Haibo Huang
Test: build Change-Id: I31c820b646e6b7ef71e5f8763071f18d8933cb28
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: e61ab5866d Change-Id: I5b74d9c13c861bdff2014acf7f051da05e63715f
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I177b354ae7a54a823b016ae25340a00efae8050d
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: If57df495fad14bfe6b90d36c0639a06036bf7731
2019-02-06Merge "Upgrade curl to curl-7_64_0" am: 55493b7b1e am: 249770a4f8Haibo Huang
am: 70ff893460 Change-Id: I19b6eadf05b8cfe2e92eb3647bffba6d71f26119
2019-02-06Merge "Upgrade curl to curl-7_64_0" am: 55493b7b1eHaibo Huang
am: 249770a4f8 Change-Id: Ibaba5b9d0b9586b4afdd809c34220464bac80124
2019-02-06Merge "Upgrade curl to curl-7_64_0"Haibo Huang
am: 55493b7b1e Change-Id: I39d6b2ad178ea0d1feff4f8c3f0fc197df20b04a
2019-02-06Merge "Upgrade curl to curl-7_64_0"android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot
2019-02-06Upgrade curl to curl-7_64_0Haibo Huang
Test: build, boots, `vendor/google/tools/fake-ota on streaming` works Change-Id: Ie80a974d5dc73c35ccb3287db30c1a9dbdbecb3b
2019-01-15Merge "Upgrade curl from 7.62.0 to 7.63.0" am: f3b10497ac am: a4f28ab1b0Haibo Huang
am: 5f1b0435af Change-Id: Ib371340a6623ec516e50991fa5361d79f3b90809
2019-01-15Merge "Upgrade curl from 7.62.0 to 7.63.0" am: f3b10497acHaibo Huang
am: a4f28ab1b0 Change-Id: Id895219271389f7fdd460c75b47d0d6ee80dc620
2019-01-15Merge "Upgrade curl from 7.62.0 to 7.63.0"Haibo Huang
am: f3b10497ac Change-Id: Ib65f1a1fa9636f67fadd1ec70b9178bfd1f634df
2019-01-15Merge "Upgrade curl from 7.62.0 to 7.63.0"Haibo Huang
2019-01-14Upgrade curl from 7.62.0 to 7.63.0Haibo Huang
Test: build, boots, `vendor/google/tools/fake-ota on streaming` works Change-Id: Iecd6120501e7a6d2c8b83c2891de62163a30f08a
2019-01-11Merge "Add default code reviewers into OWNERS" am: 98caa6f514 am: 44756cf51aChih-hung Hsieh
am: 9a11497df2 Change-Id: Ibd603d13e0e98d67ebc1183618f77f3d57eec3f3
2019-01-11Merge "Add default code reviewers into OWNERS" am: 98caa6f514Chih-hung Hsieh
am: 44756cf51a Change-Id: I639990cd3ae746e00949dadb77fd4a5297f4f5a1
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 98caa6f514 Change-Id: I8a8b36a3240ae3b1b393baa8179b7c9c1f5cb6eb
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I7ef9783ed19514eb3ddb3425ff3ad83820b97841
2018-12-13Merge changes Ib99e9aac,If5e3aa0c am: e64a242cb0 am: 8d2892cb2cTao Bao
am: 56e520dd73 Change-Id: Ifeef8abe23e78543d088dd7406be9749b2b1da5a
2018-12-13Merge changes Ib99e9aac,If5e3aa0c am: e64a242cb0Tao Bao
am: 8d2892cb2c Change-Id: I29292b0d09c9fb6909b2d511a3729aadbc35036e
2018-12-13Merge changes Ib99e9aac,If5e3aa0cTao Bao
am: e64a242cb0 Change-Id: If77798dd3983190afd64cce384007d8bac6af3f8
2018-12-13Merge changes Ib99e9aac,If5e3aa0candroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
* changes: Correct the project description in METADATA. Update to curl 7.62.0 - October 31 2018.
2018-12-12Correct the project description in METADATA.Tao Bao
Test: N/A Change-Id: Ib99e9aacba175bb44ca431b0d137630e80a404d5
2018-12-12Update to curl 7.62.0 - October 31 2018.Elliott Hughes
Bug: N/A Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works Change-Id: If5e3aa0ced1b9d13cc4f2217f381ab9df8d16dcc
2018-10-30Merge "Update to curl 7.61.1 - September 5 2018." am: 849332cb73 am: 00ae3c82a2Elliott Hughes
am: 30cb323d8b Change-Id: I70c5341781e0ec1bb2baf97811d80f49f6d196e2
2018-10-30Merge "Update to curl 7.61.1 - September 5 2018." am: 849332cb73Elliott Hughes
am: 00ae3c82a2 Change-Id: Iffd5218a33524031c10bf9991569c08e6b04e382
2018-10-30Merge "Update to curl 7.61.1 - September 5 2018."Elliott Hughes
am: 849332cb73 Change-Id: I1624020d9206b1e5c0cccd9b721590135c196af8
2018-10-30Merge "Update to curl 7.61.1 - September 5 2018."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-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-releaseTreehugger Robot
2018-10-30Update to curl 7.61.1 - September 5 2018.Elliott Hughes
Bug: N/A Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works Change-Id: Ic8598fc9d0bc029640ea3cbcecf4820d1de8f6ae
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 8c49d19ccb -s ours am: 0192b31f87 -s ours am: 8c8abcda9a -s ours Change-Id: I9829f24beab839257b446a36b3c1dc4b155f0284
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 8c49d19ccb -s ours am: 0192b31f87 -s ours Change-Id: I67d894fd0da93ebd061c4d9dcf48f77a7d746520
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 8c49d19ccb -s ours Change-Id: I33acf4ce497011a14c8671f2571ee2a2bf1dfe81
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
Change-Id: I2d174a56fc69c2a09d990ce5697aa12a2c57af8f
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 34e050651f -s ours am: d4aeae76a0 -s ours Change-Id: Ie51fd56edf6e76c4c5c4c5da63b68eac59758970
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 34e050651f -s ours Change-Id: I7164702d4690712e2f27495e4d51af0bad3b3a34
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I5f7fb99b342a0ecb475c4909dbc11c4676cc4c2f
2018-08-06Merge "Update to curl 7.61.0 - July 11 2018." am: 4855cc3da3 am: f7bbc49291 ↵Elliott Hughes
am: f011d05a67 am: c75a259e14 Change-Id: If81d5a40953d518227ed4907382e6547703418fa
2018-08-06Merge "Update to curl 7.61.0 - July 11 2018." am: 4855cc3da3 am: f7bbc49291Elliott Hughes
am: f011d05a67 Change-Id: I75bd1e6d0e0f9b83076a1c627a69752f38fc9363