Bill Yi
|
50a30f3e80
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a52301e2f5 -s ours am: f1f41abd8b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124845
Change-Id: I7954da89806a3739d758580adcbd1df1b261d2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 01:39:38 +00:00 |
|
Treehugger Robot
|
bb9689461f
|
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 636204bacd am: 217f6f75a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I41d533326b66842bc90ea20134c5b104590c0981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 01:37:00 +00:00 |
|
Treehugger Robot
|
0b3b52274f
|
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 4dac429af9 am: 07a4951e7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: Ib4586f2aedf006ac199c58544b879e58ae0cd63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 01:36:51 +00:00 |
|
Treehugger Robot
|
d08dc7a663
|
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 50244c4f86 am: 804b4d6eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I1e2a92b7026912f14632b835af89d8a77cc51d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:58:37 +00:00 |
|
Treehugger Robot
|
43a86051e8
|
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: b2b823f18e am: 5a44e6de08 am: e2a9d31903
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: Ib0ebd57653207692a3d4fdf727afde924b28d8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:58:28 +00:00 |
|
Treehugger Robot
|
835cc892ea
|
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 84adeeac02 am: 22ecaf7c85 am: 8a2c0e7eb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: I1f1e563f175d2d30d0df8187b4a4dc474f489d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:58:19 +00:00 |
|
Treehugger Robot
|
ef525e8763
|
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 02aba89873 am: d5a20542ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: Ia5e2d91fefce7b07533e933c2abc658b8fbd510d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:58:10 +00:00 |
|
Treehugger Robot
|
db677df870
|
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 28f09b6c46 am: 4f174a46a7 am: 132f4d3966
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I2997f420576b7916cfa711c1ac800df2d8d89f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:55:21 +00:00 |
|
Bill Yi
|
0e459427f3
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: 7e9b0a8bc7 -s ours am: c9ce34190e -s ours am: 3b873d5add -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: Ie8f53ff93a7fa4f5a73a249f1e2d632bd0e3ca05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:55:13 +00:00 |
|
Treehugger Robot
|
89db703d11
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 9f55b55639 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I11c2ccc5fe96118e326e35adf208f2d4ccb01c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:48:28 +00:00 |
|
Bill Yi
|
b8ddbef086
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: c4697ef5bd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I8023dae1133c5fa698727967f8296a4043a186ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:48:25 +00:00 |
|
Treehugger Robot
|
e8744354db
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: d03c1b75de -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: If09b93be65113c1fcff613f07c706d7a0da9a17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:48:23 +00:00 |
|
Bill Yi
|
f81bb062ab
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: d4b8fb52c4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Iab1ad00db2e98b602f8d504f4270e6552316941b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:48:06 +00:00 |
|
Treehugger Robot
|
55d06f519a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 57c29e30d3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I5489cc8f4c7baf496d1f8ba246180afb3ac07814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:47:46 +00:00 |
|
Bill Yi
|
1da0fb35a1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0e4e07c6e1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I6adf1f1611803783f27005469ee5b568134f5b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:47:25 +00:00 |
|
Becca Hughes
|
9272c0e3c8
|
Show disable dialog box when none is selected
Also remove from CMPP since that will be
hidden.
Test: ondevice
Bug: 281147573
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16d3b54aaf802c66be439bf65c877cba60c4390d)
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
|
2023-05-10 23:41:56 +00:00 |
|
Treehugger Robot
|
b1a9ba8a14
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1c9bf31044 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23126184
Change-Id: Ie72ec3f430219d477493d0e0a1c6fa92c9829d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:38:57 +00:00 |
|
Treehugger Robot
|
e7ff210f26
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: bb298358c9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124841
Change-Id: I4388dc786e27db25a8152226be592a5214e008f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:37:50 +00:00 |
|
Bill Yi
|
daa006af76
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 606f49981b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124841
Change-Id: I8e7d212d0f3bbd6ed6d635d26448ca1a4faaa96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:37:33 +00:00 |
|
Automerger Merge Worker
|
49f3ae7345
|
Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours am: 00769fdce2 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 265171b600 -s ours am: f54aaa1106 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 2dc66817ed -s ours am: af736477bb -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: aff5a4b154 -s ours am: 35727e14e8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 27ef5fc280 -s ours am: f2a8b2e09a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0781830995 -s ours am: 4e4c2e91c3 -s ours
|
2023-05-10 23:32:27 +00:00 |
|
Treehugger Robot
|
980c2a5f24
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours am: 00769fdce2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I02c51c9ec66836adbcd276a462403f4ccf327039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:32:05 +00:00 |
|
Bill Yi
|
a3656dc9b6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 265171b600 -s ours am: f54aaa1106 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I2c48950146fcc247cec313fd5d2bcc668f8d8e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:32:02 +00:00 |
|
Treehugger Robot
|
59e7124304
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 2dc66817ed -s ours am: af736477bb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I03fb4e3e5ea46e7bb1e162a87793e0df7bddc6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:59 +00:00 |
|
Bill Yi
|
8c210f44e0
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: aff5a4b154 -s ours am: 35727e14e8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I9ee4e2915206cb5fc4302d773dd4da7d014fff2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:40 +00:00 |
|
Treehugger Robot
|
c5fbb4e3ea
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: d8e8583c71 -s ours am: 560129e42f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ia473dbd2244c68d1f4217009298b6abf3ed5e9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:31 +00:00 |
|
Bill Yi
|
c305ac507c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: c1d77f492b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ie9082704296ce99f1632309394e8cdea630d9549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:29 +00:00 |
|
Treehugger Robot
|
6dd581d8c1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 6ace5ad965 -s ours am: 275f119ae1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I64026a6c5f583c41bd4b4c2a21553847b272a343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:26 +00:00 |
|
Treehugger Robot
|
ecc262f5fb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 27ef5fc280 -s ours am: f2a8b2e09a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ieecf24774029493228b32345ce478299de1d224b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:20 +00:00 |
|
Bill Yi
|
6f45f4f389
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: 6cc5e5c226 -s ours am: ba6a55423d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Ibe7d7a14feb62453f93fc7d939b74897239bfba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:06 +00:00 |
|
Bill Yi
|
526613d9b6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0781830995 -s ours am: 4e4c2e91c3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I6e0542eddad665f1b4d907a0688e4e903aee5789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:31:02 +00:00 |
|
Treehugger Robot
|
6cdf599ce2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 76d0d8c12b -s ours am: 8e1636b67d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I76178e3dab505c564d784639c524328b2c8b94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:30:47 +00:00 |
|
Bill Yi
|
1f75b586b6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: e578c1477f -s ours am: a8e65872e0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Idb65a638fb0b9a2488f9c85ecd31c4d11fd7800c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:30:29 +00:00 |
|
Bill Yi
|
7b0fe10dd5
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2023-05-10 23:28:46 +00:00 |
|
Bill Yi
|
94298e638f
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2023-05-10 23:28:46 +00:00 |
|
Bill Yi
|
deaa34f3f7
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2023-05-10 23:28:46 +00:00 |
|
Treehugger Robot
|
c4bd0a79ae
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: d8e8583c71 -s ours am: bae0e18f93 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ida143d9b7600ae3b618188db4d8a898bfdc85f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:28:31 +00:00 |
|
Bill Yi
|
3f76100838
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: 951739e625 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: If6ff6476a5d251636883288b51c85d9caaa7cda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:28:29 +00:00 |
|
Treehugger Robot
|
64a9cbe3b9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 6ace5ad965 -s ours am: 7fd8c31e9b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I29c0739ff4110c023769ecd87a7e5709d85b6909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:28:26 +00:00 |
|
Bill Yi
|
049ca9b48b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: 6cc5e5c226 -s ours am: 39b779caa7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I7d18e041266b774ed6bb6f0e7887d5ae301b035e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:28:06 +00:00 |
|
Treehugger Robot
|
88259ac7d1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 76d0d8c12b -s ours am: fee4798267 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ia4ece70ff1dc98610127976c59ae0cc336e44fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:27:47 +00:00 |
|
Bill Yi
|
67fcc6aea9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: e578c1477f -s ours am: e0ac237a6d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ie5c15a3a684d17fbfcbbffe049890c095788cb30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:27:29 +00:00 |
|
Hao Dong
|
755a67a931
|
Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
|
2023-05-10 23:26:02 +00:00 |
|
Automerger Merge Worker
|
fc317b7fba
|
Merge changes from topic "am-6fd2dcf4e74d46fcb79ed43906079fe9" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 880a57f232 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: d1cf4e9b4f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: e1420b8075 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227df01c9b -s ours am: 1bdb0f81c7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52978dea76 -s ours am: acce6f0f69 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6e1ce0079 -s ours am: f34ddf8255 -s ours
|
2023-05-10 23:24:29 +00:00 |
|
Treehugger Robot
|
76859a2f06
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 880a57f232 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I20e160a8597e20eaff1c80362283a300cbddfafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:24:07 +00:00 |
|
Bill Yi
|
5c4d96c9c3
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: d1cf4e9b4f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I5d6baff04c8ded091cc21172bae4a5afba7bddcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:24:05 +00:00 |
|
Treehugger Robot
|
1e378e1505
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: e1420b8075 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121134
Change-Id: Ic944201e59f83acfe9734a251eefcf82f8131a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:24:02 +00:00 |
|
Bill Yi
|
71473531c8
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227df01c9b -s ours am: 1bdb0f81c7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121134
Change-Id: Ib031c91ea9553668acda2dee914a6d2e3f3f0c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:23:43 +00:00 |
|
Treehugger Robot
|
dcc1ff6230
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 89e35d0961 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I2d4b0cf9c4dcf7ab89fa909ecab302280798bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:23:38 +00:00 |
|
Bill Yi
|
e4f00cae5e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: 6e8c9e284e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121673
Change-Id: I8f735334c8d0a4920b71b8460eff6efc82885008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:23:36 +00:00 |
|
Treehugger Robot
|
421612bc97
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: b6d69d6e4c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121134
Change-Id: Ia98e134d1f4cbf9fe767fad410395507647f8f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-10 23:23:33 +00:00 |
|