summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from apps/Gallery" am: 017b75c282 am: ↵Treehugger Robot
0312597759 am: 3482d2f065 am: 6f6c51a93f Change-Id: I5dce3eb575797af77f51d35e2105932ac4273e95
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from apps/Gallery" am: 017b75c282 am: ↵Treehugger Robot
0312597759 am: 3482d2f065 Change-Id: Id821bd1baedd10aba7592301c592b0562c7665c1
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from apps/Gallery" am: 017b75c282 am: ↵Treehugger Robot
0312597759 Change-Id: Ib0d73e83d99f3a1390a522469b98a1e7b8245b41
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from apps/Gallery" am: 017b75c282Treehugger Robot
Change-Id: I735fa585cc17d3377a92dd6f2c5ceda7a34be1e9
2020-04-29Merge "Remove MODULE_LICENSE_APACHE2 from apps/Gallery"Treehugger Robot
2020-04-27Remove MODULE_LICENSE_APACHE2 from apps/GalleryBob Badour
Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Iea20415322b4a2e482a5b17bd4e4b16372e6166f
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 14627b1101 am: 391d25e4a2r_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_305400100Automerger Merge Worker
Change-Id: I3eca611d50859056abd142c45fca62ab87f8459c
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 14627b1101android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
am: 5958163042 Change-Id: Icc3cc1542a7bed86c6c850f9291aae21630199f4
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"Xin Li
am: 14627b1101 Change-Id: I1c84db81be660ae2481fd6caf8cd511e48262401
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"android-r-preview-1Treehugger Robot
2019-12-02Merge Android10 QPR1 into AOSP masterXin Li
Bug: 145570283 Change-Id: I6a819189ce8ddb2c94f1d780af33e0b6e3cf9e4f
2019-10-31[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3d0754e664 am: 79e7951bc1 -s ours am skip reason: subject contains skip directive Change-Id: I02c72c08ff526205abb7c7f5fa076a04781e46c7
2019-10-31DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 3d0754e664 Change-Id: I4f2b0133621556b7f372871d86ad0732f6512d1f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵temp_b_145570283Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I80df822f08ce55aabeea1ded68a31deede987021
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: ea8f284912 -s ↵Xin Li
ours am: cac2f3591b -s ours am: dd4a241062 -s ours am: c62c293122 -s ours am skip reason: change_id Iaa098138703688167854d67f31e9b86a7cef1077 with SHA1 b3ca8d4615 is in history Change-Id: I925518bb1d1cebebb8b6d62d90afabc11314d207
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: ea8f284912 -s ↵Xin Li
ours am: cac2f3591b -s ours am: dd4a241062 -s ours am skip reason: change_id Iaa098138703688167854d67f31e9b86a7cef1077 with SHA1 b3ca8d4615 is in history Change-Id: Idc5297121da3d3772618792030f5937e828f01b5
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: ea8f284912 -s oursXin Li
am: cac2f3591b -s ours am skip reason: change_id Iaa098138703688167854d67f31e9b86a7cef1077 with SHA1 b3ca8d4615 is in history Change-Id: Iceac5728473f1bec72b1553fd20d9ceae389c396
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: ea8f284912 -s ours am skip reason: change_id Iaa098138703688167854d67f31e9b86a7cef1077 with SHA1 b3ca8d4615 is in history Change-Id: I300dd90bb41da37c5cdb4936ca00c85881ca139c
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: I0abf751c2d2f3b0065076886d4fd32d5cfb35cc6 Merged-In: Iaa098138703688167854d67f31e9b86a7cef1077
2019-10-23Skip QD1A.190821.011 in stage-aosp-master am: b3ca8d4615 am: d62aa28c57Xin Li
am: a08ef40ef3 Change-Id: If45c73e5b68a613731470bea2d34453561d869a1
2019-10-23Skip QD1A.190821.011 in stage-aosp-master am: b3ca8d4615Xin Li
am: d62aa28c57 Change-Id: I000df64e6b0199085055b6b4ed12fa8926f95246
2019-10-23Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: b3ca8d4615 Change-Id: Ib8674d5e143f20ae210bf7c371139eaed93bbf94
2019-10-18Import translations. DO NOT MERGEBill Yi
Change-Id: I91c91161db27088cfd4fef72a3c6e14ba056b24d Auto-generated-cl: translation import
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterb_141248619Xin Li
Bug: 141248619 Change-Id: Iaa098138703688167854d67f31e9b86a7cef1077
2019-09-25[automerger skipped] Import translations. DO NOT MERGE am: 0e06b18b30 -s ↵Bill Yi
ours am: 5600cc562c -s ours am: ec3d63f28f -s ours am skip reason: subject contains skip directive Change-Id: If980a7d5412911582f3c58da7ee386e2b2f21a76
2019-09-25[automerger skipped] Import translations. DO NOT MERGE am: 0e06b18b30 -s oursBill Yi
am: 5600cc562c -s ours am skip reason: subject contains skip directive Change-Id: I275b63571980ac66a15af2bf2e5e8cf8e88eaaf1
2019-09-25[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 0e06b18b30 -s ours am skip reason: subject contains skip directive Change-Id: I34254bca297e1a1d4fe74a6cf895ed01fe52c800
2019-09-24Import translations. DO NOT MERGEBill Yi
Change-Id: I57fa37348275688992d53c1a8200383dc63671d8 Auto-generated-cl: translation import
2019-09-22Import translations. DO NOT MERGEBill Yi
Change-Id: Iedc10a15497fccfd9b6ef3a75d6284733399d06a Auto-generated-cl: translation import
2019-09-15[automerger skipped] Import translations. DO NOT MERGE am: c5e00d42c1 -s oursBill Yi
am: 757cd8a36c -s ours am skip reason: subject contains skip directive Change-Id: I7caec1f6195c4198e3736b07246589a2991b287f
2019-09-15[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: c5e00d42c1 -s ours am skip reason: subject contains skip directive Change-Id: I4560c0ec1219ff04d542aad980b8b0c90c874183
2019-09-14Import translations. DO NOT MERGEandroid-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_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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseBill Yi
Change-Id: If4021c18f49f7f5835be51ca9a05d88949576c8f Auto-generated-cl: translation import
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4b943499d0 -s ours am: c63ccc73e3 -s ours am: 9ee9e0a180 -s ours am skip reason: change_id I74e378c19586cb1d32088a8444f47595ad0ecdd7 with SHA1 af79780ac6 is in history Change-Id: I74af4748a3b48e22470bd83c6d08757541cbef90
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4b943499d0 -s ours am: c63ccc73e3 -s ours am skip reason: change_id I74e378c19586cb1d32088a8444f47595ad0ecdd7 with SHA1 af79780ac6 is in history Change-Id: I5dfed630347784d6fb588c12d9b7e77b4a1a55e4
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4b943499d0 -s ours am skip reason: change_id I74e378c19586cb1d32088a8444f47595ad0ecdd7 with SHA1 af79780ac6 is in history Change-Id: I299f1c34c4952dff85928103499bb479131b3489
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I67771f4bc7a1fa5a448da1a1c9f7f28a8a4b72f5 Merged-In: I74e378c19586cb1d32088a8444f47595ad0ecdd7
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
3aac18932b -s ours am: e2dc8e0bc4 am: 01d8cb2284 am: 75d8f90782 -s ours am skip reason: subject contains skip directive Change-Id: I393a11513a2ebb41f351d989e0f01d9efc245b46
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
3aac18932b -s ours am: e2dc8e0bc4 am: 01d8cb2284 Change-Id: I8365c35c768422a8e92eada0580488b08a53d6c5
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
3aac18932b -s ours am: e2dc8e0bc4 Change-Id: Ifa978bb978394d3c89592b5571ec1ecd9d435ec4
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 3aac18932b -s ours am skip reason: subject contains skip directive Change-Id: I280c877be6a679166aa5b4535c088e2a2f2f2f0c
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: I74e378c19586cb1d32088a8444f47595ad0ecdd7
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 1476901e47 am: fb2c21c439 -s ours am skip reason: subject contains skip directive Change-Id: I1ce57aeead068dde445e09d25a0fd4edba1c111f
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 1476901e47 Change-Id: I606ef750bccbcff808f929e56f705fd6e18e5cd4
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I6d50c0c1e88e2323ab98e0e89671168408b5d667
2019-06-15Snap for 5663715 from cf1faa7e385264ed05e931134b5116aef6586a3f to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: I8a5dbcb97c1f2328d278b93f1f5505e0ad25178b
2019-06-13[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi
qt-r1-dev am: cf1faa7e38 -s ours am: 33a26fa991 -s ours am skip reason: subject contains skip directive Change-Id: I540197e43d01200af093d1df60bfeccc6ebca52c
2019-06-13[automerger skipped] Import translations. DO NOT MERGE am: 90b3dabe5c -s ↵Bill Yi
ours am: 9657a5717a -s ours am: b29082852a -s ours am: 349e88f2d8 -s ours am skip reason: subject contains skip directive Change-Id: I49e8dfef8d1e53b0550873ac18c0b53ffb163e81
2019-06-13[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi
am: cf1faa7e38 -s ours am skip reason: subject contains skip directive Change-Id: Ie92c1ddfa07ab68de161de765bbabc536808d81e
2019-06-13[automerger skipped] Import translations. DO NOT MERGE am: 90b3dabe5c -s ↵Bill Yi
ours am: 9657a5717a -s ours am: e8684a42cb -s ours am: c2b6f342d8 -s ours am skip reason: subject contains skip directive Change-Id: Id246da3aff52a13a45d81703986cc9cdbaa8cfd5
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 09:18:16 +0000