summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ic4892188205f92a2ff13c7e185edcc775f1bc065
2019-02-21DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Iacf20e314aed7ad8dd63517c2c920077530527dc
2019-02-20Snap for 5322077 from e6cde6e1efc11a3cf11a7417703ec6ed11b32974 to ↵android-9.0.0_r46android-9.0.0_r44android-9.0.0_r43android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releaseandroid-build-team Robot
pi-qpr3-release Change-Id: I907c83c7f6e870a91ed3951768371f57f7087405
2019-02-16[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi
am: e6cde6e1ef -s ours am: f4f1ae93d4 -s ours am skip reason: subject contains skip directive Change-Id: Iad894bac5d8d2b3113a22ab6a96367216586ea93
2019-02-16[automerger skipped] Import translations. DO NOT MERGE am: df9c98f856 -s oursBill Yi
am: f1ef444128 -s ours am skip reason: subject contains skip directive Change-Id: I83e50bb9d016b4d9f5fdf1b2cd0d24cf3c915eae
2019-02-16[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi
am: e6cde6e1ef -s ours am skip reason: subject contains skip directive Change-Id: I244af3f5f86162bbf55f4ce64deaed6397b946e1
2019-02-16[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: df9c98f856 -s ours am skip reason: subject contains skip directive Change-Id: Idf0c523b6831c821423713e9c386126996f7ade6
2019-02-16Merge "Import translations. DO NOT MERGE" into pi-devandroid-9.0.0_r47android-9.0.0_r45android-9.0.0_r42pie-qpr3-b-releaseTreeHugger Robot
2019-02-15Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9005042d6d3fdd8be55c2775a9fd1bf39ff3bf4a
2019-02-15Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ifd0ee5103ccbc319d55f27f5cc2978eddc152bd0
2019-02-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 912c83a836 -s ours am: ab5d58c892 -s ours am skip reason: subject contains skip directive Change-Id: I1b402444d68dcdeb9ca91d99c4fd4e0a150e65b0
2019-02-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 912c83a836 -s ours am skip reason: subject contains skip directive Change-Id: Ib671447dc404b1f344dc1bf94a5ee7bab47d0aad
2019-02-11DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li
stage-aosp-master Bug: 124234733 Change-Id: I5d62785cc209b72b920c19f761a9e6de9cd568e8
2019-02-09Snap for 5180536 from 466c50ab5c4943c0c9a139d42a1b4d9af7d65a02 to ↵android-build-team Robot
pi-platform-release Change-Id: Ib826f6b739036760be46fc92949e4f04fc2384c1
2019-02-02Import translations. DO NOT MERGEBill Yi
Change-Id: I7c658a65c5299b6ace02a478289a0a7e910874e7 Auto-generated-cl: translation import
2019-01-13[automerger skipped] Import translations. DO NOT MERGE am: e2c985c602 -s oursBill Yi
am: ab0c326b47 -s ours am skip reason: subject contains skip directive Change-Id: Iaedab930dc0c17c4af3e09ccc4a2c03df6b3fdff
2019-01-13[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: e2c985c602 -s ours am skip reason: subject contains skip directive Change-Id: Ifecea50b53ec73a4788724763418b51bc9b1c498
2019-01-13Import translations. DO NOT MERGEpie-b4s4-devBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I01cb129cea53e45d093b1411268b9c077f53f6be
2018-12-26Merge "Import translations. DO NOT MERGE"TreeHugger Robot
2018-12-25[automerger skipped] Import translations. DO NOT MERGE am: 3d125f433a -s oursBill Yi
am: af96b3c7b3 -s ours Change-Id: I23852635b1028400932b96f2f31a70d204ac0f2d
2018-12-25[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 3d125f433a -s ours Change-Id: Ie3520cccdf3f9f49e76bf109009723d03d7195ba
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 22:53:17 +0000