Commit Graph

127862 Commits

Author SHA1 Message Date
Bill Yi
c538b011d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours am: 6e91516467 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24272118

Change-Id: I505508c012be9e45fdbb3eb7d56ab920433de749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:12:27 +00:00
Bill Yi
6e91516467 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24272118

Change-Id: I5c7d3c5a75c697097736fa5108c8736c22b232eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:46:09 +00:00
Oli Thompson
ea18752f4a Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668

Change-Id: I7ba3169002b1d7f7c010ca078d7a723b86788dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 17:17:00 +00:00
Oli Thompson
04854b1c65 Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev 2023-08-01 16:31:03 +00:00
SongFerng Wang
b93774ab40 Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278

Change-Id: I017d432a9abe3f141436f185c156838b393d3d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 11:39:35 +00:00
SongFerng Wang
b2c60799af Merge "Fix testcase failed" into udc-qpr-dev 2023-08-01 10:55:39 +00:00
Bill Yi
c1363443ee Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I63fcff4de0780220331244eaeb16840cfeef600e
2023-07-31 16:13:38 -07:00
Bill Yi
d6e35474b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 99d99c1e0c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213686

Change-Id: Ic43dae4d1663df225e6e35b62323440f5ce68410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:33 +00:00
Bill Yi
1d4c7e2e14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38360e14cd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213686

Change-Id: I8d19557d66ccf898c61d0c6d181d38995046faa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:30 +00:00
Bill Yi
0e1b9e98b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 50b783c347 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212798

Change-Id: Ie34a242067efa4b853082003d6be5b94120ccdfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:24 +00:00
Bill Yi
dc6aa71631 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af361193ff -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212798

Change-Id: I23bb902b7220ae8f666ba53c70e671e537d12f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:24:14 +00:00
Bill Yi
ce7c2f90ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: aa0d143122 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210481

Change-Id: Id75cd984fa5444359762f0908e7a2af01911a36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:23:38 +00:00
Bill Yi
98a0fc97c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbcaa9aefa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210481

Change-Id: I0042e0a71546854c3fded0e60c39364d95263685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 22:23:05 +00:00
Bill Yi
99d99c1e0c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Bill Yi
50b783c347 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Bill Yi
aa0d143122 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Quang Luong
f55e922301 Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268

Change-Id: Ie52f8c49a6aaaae0c6932083e7efeba4121298a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 09:16:58 +00:00
Quang Luong
af1715e4a0 Merge "Fix duplicate network request entry during connection" into udc-qpr-dev 2023-07-31 08:34:49 +00:00
Quang Anh Luong
ae485a6774 Fix duplicate network request entry during connection
When connecting to a network request, a new NetworkRequestEntry is
created by WifiPickerTracker alongside the unsaved regular network,
which results in two of the same network appearing during the L2
connection phase. To fix this, filter out any disconnected networks that
have the same SSID and security type as the currently connecting
network.

Bug: 292064115
Test: manually verify no duplicate network appears when connecting to
network request

Change-Id: I3d6abb0d0a1e4eeab1b8fa396660851ba090c611
2023-07-31 14:51:07 +09:00
Treehugger Robot
b05c1aa2fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 5931e209fb -s ours am: 32d5ef74fd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I1de1042dc79d23ee10777d3e7b1a54e097cd043e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:40:53 +00:00
Bill Yi
717ff8f4cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: 1133ecb114 -s ours am: 177be97b58 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: Ifdb1554d445cbd04fb240c07c7d1b82d1db823a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:40:46 +00:00
Treehugger Robot
a1d52b6108 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours am: 868cfd4209 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: Ica383dd679708418fd97c9a341f0a593bd8cb0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:39:51 +00:00
Bill Yi
d84172e081 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours am: 5038667845 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: Ieaa8829e54f7d2dc320f7e845afb07f25a420e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:39:44 +00:00
Treehugger Robot
eb73e4002a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: b750e93272 -s ours am: 8d74cd751d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I5c713be8ed14a60f69039b4891a45cf3b945afe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:34:44 +00:00
Bill Yi
73014f9d8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: 31ea0ae325 -s ours am: b6e4f5347a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I2216394c9861ffb8f00e0c1bfb80ea691b78eb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:34:37 +00:00
Automerger Merge Worker
4f57ccddbe Merge changes from topic "am-25d5d76ca46e4430a3b3dfa6bff0dfdc" into udc-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: f4fe175b59 -s ours am: b5d2ff6e1a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: ed9ae7fd73 -s ours am: 6f28fb73b6 -s ours
2023-07-28 19:30:52 +00:00
Treehugger Robot
99e2fd95db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours am: baf2971e15 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: Ida246aee3983905c075a650d1074d380e504b21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:30:25 +00:00
Treehugger Robot
0330e02f3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: f4fe175b59 -s ours am: b5d2ff6e1a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: Ide9881a21eeca0e064ca06d97a9a5e25ec61034b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:30:22 +00:00
Bill Yi
3d32a40a33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours am: e30de33272 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I2fc2c73eea210f86ad1127c39a3a638d1efe95d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:30:20 +00:00
Bill Yi
6d905d1359 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: ed9ae7fd73 -s ours am: 6f28fb73b6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: Ic0ff32354cafa8b2d61b227285705ff79da7ba1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:30:14 +00:00
Treehugger Robot
a7dfd9a048 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: b750e93272 -s ours am: d9dc3862b0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: Idf5ab75ba0c0375d2fd30ca5b6e573ed864d6a92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:10:23 +00:00
Bill Yi
3e0e3f687b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: 31ea0ae325 -s ours am: 7ca9054507 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I31d659563e7d768f28023de7cf3783a50f59c2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:10:12 +00:00
Treehugger Robot
baf2971e15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I076709beaac7181d5e04bed0df8d20c099df6d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:08:13 +00:00
Bill Yi
e30de33272 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I7f50ac15332a254de707b070f6c12e80ddc699a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:08:04 +00:00
Treehugger Robot
32d5ef74fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 5931e209fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I50a45f36cb1d03074aa96a374ef5835acec46360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:07:54 +00:00
Bill Yi
177be97b58 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: 1133ecb114 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: Idfc1dfe3bf0079aa6c6179167db40dea79e17f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:07:46 +00:00
Treehugger Robot
868cfd4209 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I06ad5f02d6359bb0e59260bfed13993d44422202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:06:45 +00:00
Bill Yi
5038667845 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: Iefa7673de52210c6bc55a0dda3deff8e6a65aa63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:06:37 +00:00
Treehugger Robot
d9dc3862b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: b750e93272 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I804c3a209579d622e9ddceb2a0bd53db4c58cab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:50:35 +00:00
Bill Yi
7ca9054507 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: 31ea0ae325 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I8ce215eb801703b882df34ff378dd35662587b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:50:28 +00:00
Treehugger Robot
8d74cd751d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: b750e93272 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I3c8a61d9e4f391943d562ab42ccf351336608caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:50:20 +00:00
Bill Yi
b6e4f5347a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: 31ea0ae325 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I72a3e7a64bce5ef5a50df4adea494e59b44d4c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:50:08 +00:00
Treehugger Robot
b5d2ff6e1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: f4fe175b59 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: Iee097b41da9fafbe51519d009346c638a8f36ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:49:00 +00:00
Bill Yi
6f28fb73b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: ed9ae7fd73 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: Ibc74eb507e260c86a88421ce4495c1333aa3350e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:48:55 +00:00
Treehugger Robot
5931e209fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: Ia819857ed5f39e3581a6a43d80282f0c29a7d3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:45:46 +00:00
Bill Yi
1133ecb114 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I0a64ce3bce8c18572a24788f3f2f5fa27b34751c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:45:38 +00:00
Treehugger Robot
4a3b7b8492 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I14cf004b99d8d598f58263e79ef4f66cf30263c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:43:59 +00:00
Bill Yi
f07ff4759e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210475

Change-Id: I71bb876f64f137417b4a08bdd154a9fbf6784078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:43:50 +00:00
Treehugger Robot
f4fe175b59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I7d8a5a3e25cc3c91338f85199343ebbf23c89163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:26:15 +00:00
Bill Yi
ed9ae7fd73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I186a146426717dcbc2ab2ce0052b2adf27a7e6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:26:08 +00:00