aboutsummaryrefslogtreecommitdiff
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: 752c0d69bf am: 9083bced68 -s ours am skip reason: subject contains skip directive Change-Id: I7ebdd475c17377ecd3b6a7586442b55a12e32c37
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: 752c0d69bf Change-Id: Ie028918a35e49c5f7120bdf01e815ea7fd171215
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: I3ff332601cb6031643e433a94d69966ad72c3598
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: aa864d3320 -s ↵Xin Li
ours am: e8fa75389b -s ours am: 150bae1aff -s ours am: 9ae584581c -s ours am skip reason: change_id I582907b16b86bd5ff750b480bd9d325d5bd899b1 with SHA1 b13d6ba1f0 is in history Change-Id: I9460b0bcef422c16c06c5cd3d499be1f1d528d3a
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: aa864d3320 -s ↵Xin Li
ours am: e8fa75389b -s ours am: 150bae1aff -s ours am skip reason: change_id I582907b16b86bd5ff750b480bd9d325d5bd899b1 with SHA1 b13d6ba1f0 is in history Change-Id: Ifc1079071634a45fa536087278f85b8186d6a4cd
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: aa864d3320 -s oursXin Li
am: e8fa75389b -s ours am skip reason: change_id I582907b16b86bd5ff750b480bd9d325d5bd899b1 with SHA1 b13d6ba1f0 is in history Change-Id: I2167a81d71bc3119cc5e82de6e296dd2105e7ac6
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: aa864d3320 -s ours am skip reason: change_id I582907b16b86bd5ff750b480bd9d325d5bd899b1 with SHA1 b13d6ba1f0 is in history Change-Id: I13a48abfff9212a26788d71dea22d57e6c4d5c81
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: Ida64aa197c92621b13a6ef4aae9efdf802597315 Merged-In: I582907b16b86bd5ff750b480bd9d325d5bd899b1
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: b13d6ba1f0 am: 20ffa31d5aXin Li
am: 402460be1c Change-Id: I78b6189ae25517fd1e2d01331619de8afa2ab8e9
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: b13d6ba1f0Xin Li
am: 20ffa31d5a Change-Id: I9f83c2767113e9982c2d5eacfad89c3928b02c9b
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: b13d6ba1f0 Change-Id: I1a45f4f77ba56a7a4c6aa02c6c5600c7d0027405
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterb_141248619Xin Li
Bug: 141248619 Change-Id: I582907b16b86bd5ff750b480bd9d325d5bd899b1
2019-10-10Remove samples migrated to new infra.Jeremy Walker
Change-Id: I3fff274d1f43816035a1bb06989f4ecf7694028c
2019-09-26Removes deprecated samples from AOSP template system.Jeremy Walker
Change-Id: Iedf4570b2acdab807e7f35c04f45bcbd181f6ecf
2019-09-26Removes permissions samples now that new permission group repo is live.Jeremy Walker
Change-Id: If102f7b63cd1bc84df421e12458d2d9d22420a88
2019-09-24Removes media samples from AOSP publishing list.Jeremy Walker
Change-Id: I50889c1b06af60e5480e9f0665d89aee7f738eef
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 99bc15c4d5 -s ours am: b584b2a66c -s ours am: edb8d878a1 -s ours am skip reason: change_id Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8 with SHA1 5b2bb6743e is in history Change-Id: I357c72d1da0ff6e580e0b3895617c79a39762201
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 99bc15c4d5 -s ours am: b584b2a66c -s ours am skip reason: change_id Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8 with SHA1 5b2bb6743e is in history Change-Id: Ic99d2d35a5d41d892632b91295dd36f13351e481
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 99bc15c4d5 -s ours am skip reason: change_id Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8 with SHA1 5b2bb6743e is in history Change-Id: Ia5e4f75f024cb25eef29ca41d9e70c16727d2fa0
2019-09-08views-widgets: Removes all googlesample repos from AOSP.Jeremy Walker
Change-Id: Ief7315986648c753eb08bda2d4ff93251ea299e1
2019-09-08connectivity: Removes all googlesample repos from AOSP.Jeremy Walker
Change-Id: I4a78f233cee1b9981403ea946b62751de9181b5e
2019-09-08input: Removes all googlesample repos from AOSP.Jeremy Walker
Change-Id: I9af7c50c1003a353997dcfcec19cac23bb590ae3
2019-09-08user-interface: Removes all googlesample repos from AOSP..Jeremy Walker
Change-Id: Id0cab9b416285223767e4d36e74b3c9d789b9bd8
2019-09-08Sensors: Removes all googlesample repos from AOSP.Jeremy Walker
Change-Id: I3f0f0617db6ce5020260cbeb45f64ed9509c8852
2019-09-08Identity: Removes all googlesample repos from AOSP.Jeremy Walker
Change-Id: I39a544f1a6e978f0e7108ab12c06d248000418d3
2019-09-08Enterprise: : Removes all googlesample repos from AOSP.Jeremy Walker
Change-Id: Id64098c1994bacef88832fec68dafc0a2721a750
2019-09-08Graphics: Removes all googlesample repos from AOSP.Jeremy Walker
Change-Id: Iad7b3380fc0d9a7cd1247d9584987d1d2d7f2d81
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
Bug: 135460123 Change-Id: I2fb9c8f2a087158bf077dcdecad492a781415ea3 Merged-In: Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8
2019-09-05Removes storage samples from AOSP.Jeremy Walker
Change-Id: I488748b3fca0039773e3b5d11e1a11ed9db94bc3
2019-09-05Removes security samples from AOSP.Jeremy Walker
Change-Id: I22ea9c6427c3ecc3eeec186badac27858b1b8ce2
2019-09-05Removes renderscript samples from AOSP.Jeremy Walker
Change-Id: I2cc2d0b5a8cd4f3a5a48904716bd8549695209a8
2019-09-05Removes camera samples from asop.Jeremy Walker
Change-Id: Ia21a2816eedb21c4134280e925a8daa622055ffb
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
2b151947b0 -s ours am: 40993dd0dc am: 20e31c8077 am: ed65281a53 -s ours am skip reason: subject contains skip directive Change-Id: I38744060caa7a4a6b80796baab9017b09e7d085d
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
2b151947b0 -s ours am: 40993dd0dc am: 20e31c8077 Change-Id: Ie10bc099f662afa7d33f225024702c02f3d5b0dd
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
2b151947b0 -s ours am: 40993dd0dc Change-Id: I240e9f827dcfd795c5482c5741e9f466d66be654
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 2b151947b0 -s ours am skip reason: subject contains skip directive Change-Id: I699359c52bdad17b6df966219e3f92363c506f8e
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: Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8
2019-08-30Removes animation samples.Jeremy Walker
Bug: 140198820 Test: Manually tested Change-Id: Ife64039d1d016d75634526f0bb44d297cca98621
2019-08-30Removes Wear samples.Jeremy Walker
Bug: 140198820 Test: Manually tested Change-Id: I375adfd8f9a5e9dcdf8b088903ae1eb44ee4048c
2019-08-30Alphabetically sorts list (no changes).Jeremy Walker
Bug: 140198820 Test: Manually tested Change-Id: I14558a4c1813161fd244e9334cf55129aa69715a
2019-07-18Snap for 5736565 from bec0cbb1e461478a9d8f4319a85edfe84a19963f 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: I3da4c47b67496f19a776b08eb82da9cc73e40927
2019-07-17Merge "Deprecates wear os samples in ASOP. am: df20f455af am: c30c60602b am: ↵Jeremy Walker
bec0cbb1e4" into qt-r1-dev-plus-aosp am: c77d1b99de Change-Id: I0e1a331d3649c3d580588bba596cd859102ba56f
2019-07-17Deprecates wear os samples in ASOP. am: df20f455af am: c30c60602b am: 781bdafa20Jeremy Walker
am: fa60657e28 Change-Id: I4fb66c2af26b5a631856048d76d0d5d058f32065
2019-07-17Merge "Deprecates wear os samples in ASOP. am: df20f455af am: c30c60602b am: ↵Android Build Merger (Role)
bec0cbb1e4" into qt-r1-dev-plus-aosp
2019-07-17Deprecates wear os samples in ASOP. am: df20f455af am: c30c60602bJeremy Walker
am: 781bdafa20 Change-Id: I054469afc7900001ec422eba6db259eaea443044
2019-07-17Deprecates wear os samples in ASOP. am: df20f455af am: c30c60602bJeremy Walker
am: bec0cbb1e4 Change-Id: Iba2c06abac715f041f424a2fa38eeeb82b6e8b46
2019-07-17Deprecates wear os samples in ASOP. am: df20f455afJeremy Walker
am: c30c60602b Change-Id: I1e8f181b8ca8958a0f893af6e3d93bd598ee7614
2019-07-17Deprecates wear os samples in ASOP. am: df20f455afandroid-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_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_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-releaseandroid10-d4-s1-releaseandroid10-d4-releaseJeremy Walker
am: c30c60602b Change-Id: I6e284c7ce84d22923e11414e3239acce0cb40223
2019-07-17Deprecates wear os samples in ASOP.Jeremy Walker
am: df20f455af Change-Id: I9311b54063736396cc2d3ceabf79e2e8a15de7c5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 21:29:55 +0000