Bill Yi
312a8e897f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f
-s ours am: 128036a053
-s ours am: 0714fceee2
-s ours am: c34cee7c73
-s ours am: 00ceb6bd85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I4d98773c4e2725c6393093d01eaa32de43743743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:45:13 +00:00
Bill Yi
c585b01643
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b
-s ours am: affa411d4e
-s ours am: 7389f5fc2b
-s ours am: 965aa2c306
-s ours am: f1a74c3cfd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I971aabed594eed0dfbfe72e43a60a625bd0d34fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:45:09 +00:00
Bill Yi
4368250d7a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f
-s ours am: 128036a053
-s ours am: 30884de198
-s ours am: 4b4a28ef4a
-s ours am: 226288cf2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I4e58b288af3e00c01bd4d964727f7fff702de51a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:44:36 +00:00
Bill Yi
54cce31c54
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b
-s ours am: affa411d4e
-s ours am: 79b4a2bfe0
-s ours am: 51482e5650
-s ours am: 0b927812f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: Iec8c2b31112476265557eab768a291df13f0c76d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:44:31 +00:00
Bill Yi
80b71ea0af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f
-s ours am: 128036a053
-s ours am: 0714fceee2
-s ours am: 8b8f302554
-s ours am: e90b75b012
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I5b21098e6a6508b76fe2e9db3ed33ca7ede5624e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:43:49 +00:00
Bill Yi
00a714b4ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b
-s ours am: affa411d4e
-s ours am: 7389f5fc2b
-s ours am: 3c5a358987
-s ours am: 8ecef370bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379717
Change-Id: I77aebefa0a0a5176ab925de63a3a5a385ac49722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:43:44 +00:00
Daniel Huang
39d18b4fb6
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
am: 35d25a92d1
am: e72e0efb06
am: 0add67a3fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: Id94284c87fdbc6444c13d87a2565f4e5dba8af0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:42:24 +00:00
Daniel Huang
607ec8615c
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
am: dd8283f708
am: 56ca06b8c5
am: 4d3e45b14b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: I052398256c4757ea7f075244c20154263ca21ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:42:16 +00:00
Daniel Huang
166ff82c21
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
am: 35d25a92d1
am: 1dd13430cc
am: 392bf8cc1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: I51d171c501bbaef52ef09831748c098098e4cd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:42:00 +00:00
Bill Yi
228e459794
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7
-s ours am: 0fd5495eff
-s ours am: 16b592fb33
-s ours am: 73a02b6b63
-s ours am: da001b042c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: Ib1b22537ceae3fdf1291ab33f8ecc09d152e047e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:08:40 +00:00
Bill Yi
98e513dac3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6
-s ours am: 2ab5a7908f
-s ours am: 5c826f73d1
-s ours am: efbd369d04
-s ours am: a58f127b31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I143a26ee93b6cac6e6512d670f71051968019bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:08:18 +00:00
Bill Yi
f62d644af8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e
-s ours am: c40e106be2
-s ours am: d2bd70c172
-s ours am: 0388f986a9
-s ours am: 29a29b1115
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: I03114b6ca100c544dca937bfc75a4a7fccbf8a83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:05:58 +00:00
Bill Yi
917b0106b0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7
-s ours am: 789290be46
-s ours am: e379726b51
-s ours am: 2ccfd19de9
-s ours am: 15a9320fda
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I9fbf260dbf7cf453e6c1698af04e8cdda34d6f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:01:40 +00:00
Bill Yi
b431d9fa28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6
-s ours am: c5a289d530
-s ours am: 1187b059e5
-s ours am: 2b3db795c2
-s ours am: cf55a34b9c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I58d884d714dc2c9f75c4e870ac1f7909ba9c1225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 19:01:16 +00:00
Bill Yi
50bf07876e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e
-s ours am: c40e106be2
-s ours am: 1288b1b851
-s ours am: 110d4e79b6
-s ours am: e4f0727aa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: If365045bdcf0d59265a03d982f3dc4d4c62b3391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:59:41 +00:00
Bill Yi
0e04ef4b24
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-05-24 18:47:59 +00:00
Bill Yi
b88b9437ed
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-05-24 18:47:59 +00:00
Bill Yi
61f0f3cd49
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-05-24 18:47:59 +00:00
Bill Yi
7aaca6b057
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e
-s ours am: c40e106be2
-s ours am: d2bd70c172
-s ours am: dda3891316
-s ours am: 5edb31bd42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379713
Change-Id: If7821e93604eec484f27ddbb8e861c5f99baf98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:44:35 +00:00
Bill Yi
f3c68e300f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c
-s ours am: ae5e86f283
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: I019a9c893af8214bcbd337e4975800aadca1f546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:02:24 +00:00
Bill Yi
4e2592b4f1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4
-s ours am: 2affec9bb9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: Ic76a84fc81b349dd236cd6b9ec29dbaa21b4b06a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:02:22 +00:00
Bill Yi
2041b90637
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c
-s ours am: f8bc9d8d44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: Ib842aee6375c8376030d3d2a584b4c6607bf665f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:02:16 +00:00
Bill Yi
63b9f34873
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0
-s ours am: 85cad646c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: I71f4213180df8b13fa3edbd459f2cd82540b9c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:01:48 +00:00
Bill Yi
1fda5b526f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13
-s ours am: 8fd4e1cc3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I6aaa8d706a1d3593acd0f95cd9631101d343a3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:01:21 +00:00
Bill Yi
77be6c4eea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9
-s ours am: 7af5bff35e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I0ce354e6d654ee5f6f5cd78a4f2c8a5c84d6a55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 18:00:59 +00:00
Bill Yi
378937dd4b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c
-s ours am: 57f926c95d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: I18986dc3ec1ee5f4245bc59428490994a7dfcc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:56:40 +00:00
Bill Yi
f96b2f4688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4
-s ours am: b531e765fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: I3eb07a2706cf837f344d21659daaac419065d6af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:56:37 +00:00
Bill Yi
9d96de691b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c
-s ours am: 9ed3697c68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: I907e0ac5cc78c5a1d589e2be47ed20677f3edce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:56:31 +00:00
Bill Yi
6520274437
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0
-s ours am: bc52047a0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: I39a0adf6cc90fea2204c1735dc4a3f160e6d5fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:56:02 +00:00
Bill Yi
4a00be5d4b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13
-s ours am: d54daa1c26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I5f9110e01971fabe18cff2dd0a2b836036161e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:55:36 +00:00
Bill Yi
7c529a17f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9
-s ours am: d9d4ed48e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I296f350fe6381f636293d64a77e7863a488b569a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:55:14 +00:00
Bill Yi
ae5e86f283
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: I004622940f7cd703d8a300e5445478c33023c3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:39:24 +00:00
Bill Yi
2affec9bb9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: If5c641f24bace7be5df568522e143cee790cdad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:39:18 +00:00
Bill Yi
f8bc9d8d44
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: I0b71c76b8ddaa27509076c335f3551440617cbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:39:14 +00:00
Bill Yi
85cad646c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: Ifb4872706fa2cb3f5e5560cc202eeb1a8b82c7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:38:40 +00:00
Bill Yi
8fd4e1cc3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I8d0f764b1d8447d6b39e1f5d9c0b6bd08dd42458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:38:17 +00:00
Bill Yi
7af5bff35e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I74dff6cfaf6c162c1c7fa32636b23b5d74428da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:37:58 +00:00
Bill Yi
57f926c95d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: I5e59db548a7277241a9ccaec754033b90cf954cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:36:00 +00:00
Bill Yi
b531e765fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379723
Change-Id: I36cb7805f09e36dd5faeef7c0def750a198a1428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:35:58 +00:00
Bill Yi
9ed3697c68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: I03ac3e0b8dd7c4a99bc9d357f23257097b081776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:35:52 +00:00
Bill Yi
bc52047a0d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379720
Change-Id: I8dddffd8855e1ddd235305cb8153054fe388475f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:35:16 +00:00
Bill Yi
d54daa1c26
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I5815e44184fc69caea51ebbe8944af8b4990fb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:34:53 +00:00
Bill Yi
d9d4ed48e7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379719
Change-Id: I899acc4c367de63c7d2cdc0b38c9ee17c4d22c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:34:34 +00:00
Diya Bera
71dd391e4d
Fingerprint Error Dialog
...
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.
Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog
Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
2023-05-24 10:15:52 -07:00
Bill Yi
dc4c6cf07c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Bill Yi
5ee6cbb95c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Bill Yi
62106c3d13
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Bill Yi
156beaa5b4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7
-s ours am: 789290be46
-s ours am: e379726b51
-s ours am: 6b6386163e
-s ours am: e54a0e6a62
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: If7c6597934a4235f0237e5d65038189fd2cb52f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:13:54 +00:00
Bill Yi
2d07ac7638
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6
-s ours am: c5a289d530
-s ours am: 1187b059e5
-s ours am: a7016867de
-s ours am: 3f6346370d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I79be10f9b5a5378aab16627fb3496efdb3b9e7b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:13:31 +00:00
Bill Yi
20ed0ab26a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7
-s ours am: 789290be46
-s ours am: 5a18114757
-s ours am: 8ea4882c07
-s ours am: b84c9d2576
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I74704ed6222ab5146a0967270277e02b44f04f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 17:11:51 +00:00