Bill Yi
7ed996df9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095
-s ours am: 0890e485b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19163100
Change-Id: I3409df149abe3ee5dac460a2574a74f5f8d4c33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 01:32:42 +00:00
Bill Yi
8cbbe62278
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27
-s ours am: 99d07e12da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19163099
Change-Id: I3033f21a14c27b4b4d26e8eab0face01f85e8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 01:32:23 +00:00
TreeHugger Robot
3512ebb5cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f09916f9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19163100
Change-Id: I511901375a3715a64bc7fa39d172c26289e26bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 01:12:36 +00:00
Bill Yi
0890e485b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d5864095
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19163100
Change-Id: Ief0ca40acbf2f0911e37a287fe7ce9bd2097e218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 01:12:19 +00:00
Bill Yi
99d07e12da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19163099
Change-Id: I49c81a9ccbfec0f3542f6c1f72c92da212d11091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 01:12:04 +00:00
TreeHugger Robot
6f09916f9d
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-07-05 00:45:36 +00:00
Bill Yi
d2b251ec36
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I750415ef848997b21de83b901e41bcf2b141777e
2022-07-04 12:21:22 -07:00
Weng Su
08adf4c2ed
Ignore CRLF strings in display SSIDs to avoid display errors
...
- Keep user-entered SSIDs in Wi-Fi Configuration
- Ignore CRLF strings in display SSIDs only
Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00
Bill Yi
b4523a0392
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28a1a8af7e44edb875d10d7cc989e1521108aafb
2022-07-04 12:17:11 -07:00
Bill Yi
72134f4c83
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaab33a1f7bdac3231cad97238a8e9cb23427dc58
2022-07-04 12:12:55 -07:00
Bill Yi
80c1acdaf0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8aeff68684c763f108bdba696080011e60301ad9
2022-07-04 12:04:22 -07:00
Bill Yi
b8ae8cd5c5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I97697f451f1420bccede0fe8d345c2c02146c6f0
2022-07-04 12:02:33 -07:00
Bill Yi
cab8532874
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a7c146633f64ddf3a5b0810491dd8753be7d18b
2022-07-04 12:00:44 -07:00
Bill Yi
2c65a1d804
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8fb18f2250c868b4015d64f81d830d0391799479
2022-07-04 11:50:26 -07:00
Bill Yi
b55af7d44d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I457c216efddb0aff3f15c205d2bda71edc386e1b
2022-07-04 11:44:35 -07:00
Bill Yi
72d5864095
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
2022-07-03 14:12:52 -07:00
Bill Yi
1f4237da27
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic08c9ecc8d5fe64b43b00c9f87860ee2a5f5b46b
2022-07-03 14:08:30 -07:00
Automerger Merge Worker
77a97bba64
Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: 6e4fd42dac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I4888f6731485a54624e5e940fa06e1f377247c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:51:58 +00:00
TreeHugger Robot
5f246992e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: ec5ba801ba
-s ours am: 41d9c1ccb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: If2e20e2104eedd3f891d741ae6c0ad82fb536a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:51:43 +00:00
TreeHugger Robot
41a2371036
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: 2ec12f7701
-s ours am: 4da1e46d66
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: Ib3d1989e486cf0e4a5096d121dec0e4ec34ce80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:47:21 +00:00
Bill Yi
5e2224db6c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: 281a9b7507
-s ours am: bd65c258bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: Idba5f61cb6efbb06fe5ba351a1d031a437536b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:47:07 +00:00
Automerger Merge Worker
6e4fd42dac
Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: ec5ba801ba
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: e5e9661324
-s ours
2022-07-01 16:25:48 +00:00
TreeHugger Robot
41d9c1ccb7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: ec5ba801ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I48d9bcd4fe47e20f2d4d374c0d9862fae442be21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:59 +00:00
TreeHugger Robot
4da1e46d66
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours am: 2ec12f7701
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I211dcf4f7569227e72d6d7927c031e5e1c321f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:50 +00:00
Bill Yi
cd8d1eecd8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: e5e9661324
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I7745af204a16d8efc774ffa8c7ee8adc71551a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:43 +00:00
Bill Yi
bd65c258bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours am: 281a9b7507
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I5acd27c0c6052afa3a891d01c39e0c67f01b253f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 16:23:30 +00:00
TreeHugger Robot
ec5ba801ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I5e28452c29fb27e398a4c388a85c0e347d01ee64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:54 +00:00
TreeHugger Robot
2ec12f7701
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: Ic84b8415af1de525b81779425e03f4873344819d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:39 +00:00
Bill Yi
e5e9661324
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: Id148d0230825c08c8afe434ef6a65c77f004c62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:38 +00:00
Bill Yi
281a9b7507
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I97870469241d1530ef0acbf7dedaa7dc88994ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:22 +00:00
TreeHugger Robot
ccd485016e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-01 15:38:52 +00:00
Automerger Merge Worker
e0600ae051
Merge changes from topic "am-bd02cec51a7c47dda2adc777e3666a7c" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b
-s ours am: 649e89d2ee
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff
-s ours am: d69c3e175e
-s ours
2022-07-01 07:32:16 +00:00
TreeHugger Robot
0c724a6f1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b
-s ours am: 649e89d2ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: If3fb5f3cee40e3ca61ebebd0974e5307f1c9c2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:31:07 +00:00
Bill Yi
ded7d7f6c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff
-s ours am: d69c3e175e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I597a227487ed7dc7444a3a3048d1ad33fb493bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:30:49 +00:00
TreeHugger Robot
316a265b80
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b
-s ours am: 2f79c879cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I77d43d371feec704c9613311ad45eb41b2443fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:30:44 +00:00
Bill Yi
751c73ac30
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff
-s ours am: 7d8e972bd7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I4f9d12964f2b31585e4dafb51dbaccb934ccf78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:30:28 +00:00
TreeHugger Robot
649e89d2ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: Idf766fb07ab08b24946ed8b3b17212e0e05efd0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:05:09 +00:00
TreeHugger Robot
2f79c879cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I3cdd22cc82569aeb2628adae2703f80f4d8684b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:05:08 +00:00
Bill Yi
d69c3e175e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I42f49c828d21c6945191af0654fca3ccccb97071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:04:50 +00:00
Bill Yi
7d8e972bd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161
Change-Id: I9c095f83aa8c0af5dc2ef0d20772a998e2512893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 07:04:46 +00:00
TreeHugger Robot
2c5705010b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-01 06:33:55 +00:00
TreeHugger Robot
42d25a272d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c037a7c811
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133164
Change-Id: I3fc8a36a40ad8c5ab40a298e485b905c345dcbb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 03:31:08 +00:00
Bill Yi
fb7f6b8a3a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac73a2f10f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133164
Change-Id: I53f6d25b1c14c9f5c79c840e4b5eae34a3904335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 03:30:31 +00:00
TreeHugger Robot
ad603e2ece
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 10f1d35eef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133160
Change-Id: I57ae1ca9e5386981631b3054d0e2bd36b88b4673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 03:30:09 +00:00
Bill Yi
77adb10b2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d642b8754c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133160
Change-Id: I5a11d64a9e95b7ef272a05df2a723e5d81803067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 03:29:50 +00:00
TreeHugger Robot
c037a7c811
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-01 03:11:28 +00:00
TreeHugger Robot
10f1d35eef
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-01 03:11:28 +00:00
Automerger Merge Worker
3e91217ba4
Merge changes from topic "am-92a10bb61c25454cb97bca40d2487b12" into tm-d1-dev-plus-aosp am: 1e4de9c9ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: I74567d5854fe33454a1db27aafba6f3885c8fce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 02:13:33 +00:00
TreeHugger Robot
e0180e77a3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255
-s ours am: f4cd4b3e68
-s ours am: 2b381151ee
-s ours am: 0ec68d2a3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: Idfe9e35d9322929631b3de77671f682be6a785b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 02:13:23 +00:00
Automerger Merge Worker
c376a14db6
Merge changes from topic "am-9133789c405d40309ee5fd09c8a75e13" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255
-s ours am: f4cd4b3e68
-s ours am: 26c64d0ffe
-s ours am: 61f8ab9027
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc
-s ours am: 917e5c6946
-s ours am: 3792be9679
-s ours am: 48018d069f
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284
-s ours am: 76e5357179
-s ours am: f924935a30
-s ours am: b649de8a4e
-s ours
2022-07-01 02:12:21 +00:00