summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-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_r10android11-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-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 82f1008f94 am: 481c220b0b -s ours am skip reason: subject contains skip directive Change-Id: I3a6d30448b2248807a5edf579f72bb6ed885b75e
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: 82f1008f94 Change-Id: I880d7317d1d1224f2c4c6631a173a0ad34eac7db
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: I47fa4ba4ec61055b7744a6574916e4d8cf8dcc1d
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 260cab7892 -s ours am: 1b06528325 -s ours am: d1f953fad8 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: I45ce7f338e7b43ab807b8dc94084d91afe56c41a
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 260cab7892 -s ours am: 1b06528325 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: Ieac914597192851fafec2ef3fa3b009bd1f23877
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 260cab7892 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: Ied17a74ac75304af1e2f6fd0bb804293789e3cec
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I65ad12e59bb1b4e0e2d894283fa7e5e91c766d5a Merged-In: I38429ee13989d447b1350d9f098d22786c2e9447
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
3343873fa1 -s ours am: 8d58738c9f am: 2cdd50295e am: 5d7bf4dce5 -s ours am skip reason: subject contains skip directive Change-Id: I3dc885aef58c77ce295ff67d8e057d86597eb266
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
3343873fa1 -s ours am: 8d58738c9f am: 2cdd50295e Change-Id: Ie14f404ff1f467c487b67b4bb777f8d9f4ffb0e8
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
3343873fa1 -s ours am: 8d58738c9f Change-Id: Ib3fed937c9f5bf4f8f803a92c034bd91950a0a91
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 3343873fa1 -s ours am skip reason: subject contains skip directive Change-Id: I1456af3df971e2b8aef08d1b5ce72249861a2486
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I38429ee13989d447b1350d9f098d22786c2e9447
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: aa06a98b93 am: f51db88f7e -s ours am skip reason: subject contains skip directive Change-Id: I4989e4bd104fdf24d7124852d37213e4259077db
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: aa06a98b93 Change-Id: I4e7d97a7c2a75aa5ad439fcc68f07c159931c0b8
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I5e74b54945db4e896b45312ec51d2a4facc01c55
2019-05-31Update owners file for setup wizard libMaurice Lam
Test: None Change-Id: I42094c9d84f2d963d2470579223e12cf25eec45a
2019-05-17[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am: f26a9e8e2e -s ours am: 93dacd74ef am: c504e1f5f8 -s ours am skip reason: subject contains skip directive Change-Id: I116917b5646b385e4962d128920a0b0120da0b5b
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am: f26a9e8e2e -s ours am: 93dacd74ef Change-Id: Ia58457aba3b6a96b1098c3feb99d017c7a75bfab
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am: f26a9e8e2e -s ours am skip reason: subject contains skip directive Change-Id: I7cb26cfa07d5b3e8e3bad5b24690dae0a6877255
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am skip reason: subject contains skip directive Change-Id: I712ad83436692f6a78d74e428291f30dd479f3db
2019-05-16[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190505.001) into stage-aosp-master am: 9bff145e87 -s ours am: 348f81ec4c am: 4eba75a761 -s ours am skip reason: subject contains skip directive Change-Id: If497850e5c0f942690eb4fd8ca0aa4b9b4fba942
2019-05-16[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190505.001) into stage-aosp-master am: 9bff145e87 -s ours am: 348f81ec4c Change-Id: I0bf3c8581d5d2d4ac872174cf11875bf00003734
2019-05-15[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190505.001) into stage-aosp-master am: 9bff145e87 -s ours am skip reason: subject contains skip directive Change-Id: I903b5075f4e71fb6849a1d492178a0cecbd33030
2019-05-15DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 132622481 Change-Id: If13af1e31abded9dd49cca010414432ddcad4d8d
2019-05-13DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into ↵temp_b_132622481_stage-aosp-masterXin Li
stage-aosp-master Bug: 132622481 Change-Id: I91dbf16a1e49e138aa2fbc4a7e54fe8b0fc660a6
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: ↵Xin Li
2494de82e3 -s ours am: 5b42503b66 -s ours am: 9db9d874a8 -s ours am skip reason: subject contains skip directive Change-Id: Ic7d9c49e611e496367a6478290c04c15b1a704e1
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: ↵Xin Li
2494de82e3 -s ours am: 5b42503b66 -s ours am skip reason: subject contains skip directive Change-Id: I748320224338757922dd9897e9e8d4933e8e9418
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
am: 2494de82e3 -s ours am skip reason: subject contains skip directive Change-Id: Ic939cf267f1b11302ae342d447b240e9d41c5f51
2019-05-09DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
Bug: 131756210 Change-Id: Ia6aaf3bc9301d914668a11345bc39a25a1f14871
2019-05-07Snap for 5450365 from 1d64a3d08fa77af4c065bbe4135403c17275e607 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: I1fb7dcaa3e5603f2d32dda3ca944cd2a7bbdc3d4
2019-04-12[automerger skipped] Merge "Import translations. DO NOT MERGE" am: ↵Bill Yi
8069da859c -s ours am: 58685f02a2 -s ours am: 65b333a2cf -s ours am skip reason: subject contains skip directive Change-Id: Ie1799f5d39471d61487c20e069307299afa07624
2019-04-12[automerger skipped] Import translations. DO NOT MERGE am: a9174a7fd7 -s ↵Bill Yi
ours am: 1e287c4459 -s ours am: 03b7dbc891 -s ours am skip reason: subject contains skip directive Change-Id: I033e0974c1b5bce48f878d360111b8737fc74bca
2019-04-12[automerger skipped] Merge "Import translations. DO NOT MERGE" am: ↵Bill Yi
8069da859c -s ours am: 58685f02a2 -s ours am skip reason: subject contains skip directive Change-Id: I5686dfd9f4897ce3e134932ea7016be970058658
2019-04-12[automerger skipped] Import translations. DO NOT MERGE am: a9174a7fd7 -s oursBill Yi
am: 1e287c4459 -s ours am skip reason: subject contains skip directive Change-Id: I2617373cf49a5033ff02c4287fbe765fe63be516
2019-04-12[automerger skipped] Merge "Import translations. DO NOT MERGE"temp_b_131756210_stage-aosp-masterBill Yi
am: 8069da859c -s ours am skip reason: subject contains skip directive Change-Id: Ibb271460e1e291a8d57eae9bcba04874c5fc1b3c
2019-04-12[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: a9174a7fd7 -s ours am skip reason: subject contains skip directive Change-Id: Id5873d9f6e31d126b3b7aa6859f221f16cf7a1f6
2019-04-12Merge "Import translations. DO NOT MERGE"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-04-12Import translations. DO NOT MERGEBill Yi
Change-Id: I55359ceb0e611ce8782d7a4162846d1b157d6d46 Auto-generated-cl: translation import
2019-04-12Import translations. DO NOT MERGEBill Yi
Change-Id: Iccc3338e2f0fdf47723372b44d1d47adb4b79181 Auto-generated-cl: translation import
2019-04-03Merge master@5428150 into git_qt-dev. am: 2ee8b9ba62Bill Rassieur
am: 83c173db43 Change-Id: Icb2b8b74cfc39b6df71f4ce06e7af127191a85dd
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: db8640b3a5 Change-Id: I1e484d53a35cc29eb287456e81884dfffb38e394
2019-04-03Merge master@5428150 into git_qt-dev.Bill Rassieur
am: 2ee8b9ba62 Change-Id: I86de27e080cc1c7ba7dd25d826bc9f5835f660cb
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Iea225ccac1abcab67b9c83825e0557aa3e090f42 BUG: 129345239
2019-04-02Merge master@5428150 into git_qt-dev.Bill Rassieur
Change-Id: I2e90a65a89e12c9344efc04523f6f429fd75a50c BUG: 129345239
2019-03-28Support isSetupFlow extra in the deprecated setupwizardlib libraryCyril Lee
The isSetupFlow extra is introduced in SetupCompat/SetupDesign library. However, the client use this setupwizardlib library will lead WizardScriptHelper#isAnySetupWizard() of SetupCompat not work from Android Q since isSetupFlow extra will be truncated. Success log for after patching setupwizardlib and replacing FactoryOta http://gpaste/5367975093731328 Bug: b/129445834 Test: mma and manual test Change-Id: Ia5ba16d2bf3d3b3e489a52369f234819165d5de7
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
2fc5c7898a -s ours am: 17da719d0f -s ours am: aee7e6e858 -s ours am skip reason: subject contains skip directive Change-Id: I1d4acfc0497cd87a3c227a8ceb1e910a36615dae
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
2fc5c7898a -s ours am: 17da719d0f -s ours am skip reason: subject contains skip directive Change-Id: I3dd888d1baf473a652ffcc7cc505ad4821f82296
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
am: 2fc5c7898a -s ours am skip reason: subject contains skip directive Change-Id: Ibc5aac68049c52a0953e0ba50f8196fefcc57385
2019-03-11DO NOT MERGE - Merge PPRL.190305.001 into masterandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Xin Li
Bug: 127812889 Change-Id: I8e8b5ca02fa5eeefa26fcfd82d18b61a500855a3
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 6b729f3af8 Change-Id: I9fe086e38f8004a79c5b090e7215d84ecd2bc257
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 17:20:12 +0000