PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,357 Commits 1 Branch 0 Tags
d997ade44738bb1f221ae8535dd9b5b51f6faa23
Commit Graph

126357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matías Hernández
50df60c93c Don't hide approved NLSes in Settings am: ff255c6eda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:57:15 +00:00
Matías Hernández
d7608c84b4 DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581

Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:52:41 +00:00
Treehugger Robot
03b39bc5d3 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725

Change-Id: I6e8bb778a0c9a7e45965bebe6605bac76915aad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:28:49 +00:00
Treehugger Robot
3494d09de4 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev 2023-06-14 12:00:21 +00:00
TreeHugger Robot
bfcd9613f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f2f899106d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82ef8a5284c15bc7d6c8bfc63e7ea57cac87d9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:48 +00:00
Bill Yi
e2b859d86f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6f09ef6f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69f8255e3330569e7b8a50f3402aee0291400166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:38 +00:00
TreeHugger Robot
d110250b6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 3b89844e7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38910b55fe58dfc205048f194f49336e2cb9ff18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:31 +00:00
Bill Yi
e1c47d39a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1407e61f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4af1da0e984c72c139fb76b63fefe6c178013c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:14 +00:00
TreeHugger Robot
97f52a705d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6fd46cf3a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7d5ac7f4ea609180334f66b61f42b47f1201d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:05:57 +00:00
Bill Yi
162ca4c3e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8430cda6d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I248613757200e08eafa31b06a62f4019ad5257fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:05:36 +00:00
Weng Su
6a20a8c5df Fix Hotspot & tethering settings crash 
- Cannot omit addPreferencesFromResource even if UI is restricted

Bug: 287172382
Test: manual test
atest -c WifiTetherSettingsTest

Change-Id: I1f5c0215a635fddefe7eaa20c1d765634b505121
 2023-06-14 18:59:30 +08:00
tom hsu
bcd6bf1f8f [Settings] Fix roboletric test fail and add new test case. 
Bug: 287177689
Test: atest passed
Change-Id: If927f4e4bf7ee9702e865e77f350164a93729940
 2023-06-14 10:13:55 +00:00
SongFerng Wang
2a6553b122 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 am: 7f29649aa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23688861

Change-Id: Ie4d1c3582b63c446f145c008d390d3b0f37a8584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 09:51:23 +00:00
SongFerng Wang
7f29649aa9 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: I278260f1a36ed24fd1ca2d53ffc7ff2431fd1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 07:54:48 +00:00
Treehugger Robot
688c012a3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours am: 1adf54b282 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35f05ac81d0d9cfdc288f9d2480c3f3606a596b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:21:12 +00:00
Bill Yi
723eeee433 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours am: f49484b2d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I123e158f045f6be76dcc5977335faec2fd460a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:21:10 +00:00
Treehugger Robot
c08531f0e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: e2ee732578 -s ours am: 104870a508 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51745df13117daff87b82534a107a9d25ef4ca78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:20:38 +00:00
Bill Yi
9f5aacb024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: a49576b187 -s ours am: e5ed4f2cb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I212e28f5627502255f7bb0c182d9ec712b14617a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:20:28 +00:00
SongFerng Wang
61ef9024c8 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: I9b061b1c90bc7033e4400d192ed5211e9ea9bb13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:20:17 +00:00
TreeHugger Robot
c358727f7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I379721e942351a8ad3c9bd51a6ee4bd23fa96465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:04:06 +00:00
Bill Yi
7b59426838 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92231aca61cd8065cc97abb427843e8f157dd393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:03:56 +00:00
TreeHugger Robot
2d110c54dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bcb09fac84acbc00d7580c025e39125268ab935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:03:48 +00:00
Bill Yi
03aece6855 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I906d990cc3237eac3a3973a39e69fcced958f6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:03:18 +00:00
TreeHugger Robot
49a26f49c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62cb6cb14706ebed57a4ef86fc7a6b2d4f33b2a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:02:58 +00:00
Bill Yi
4f14f98b2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dfc8f0a08cb8ba7a98b4bfd59df504c3892debf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:02:41 +00:00
Treehugger Robot
1adf54b282 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3df7676bdca57767633a9068f66658c379a34001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:01:13 +00:00
Bill Yi
f49484b2d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee9cc5897a9985b66390654871a592df1e973dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:01:10 +00:00
Treehugger Robot
104870a508 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: e2ee732578 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5600f32f183826711d21067e32ec05268899cf39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:41:22 +00:00
Bill Yi
e5ed4f2cb0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: a49576b187 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39842e21c9941bd27cbf08ca4efa25646a142903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:41:13 +00:00
SongFerng Wang
448c8b61a8 Merge "Remove the owner" am: 286344d539 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: Iad21da9fbcd8d9279c27beb7a7c0761644d8f2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:36:47 +00:00
TreeHugger Robot
90cf6e8a3c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-14 05:24:47 +00:00
TreeHugger Robot
9d38813d4b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-14 05:24:47 +00:00
TreeHugger Robot
c937ce7a22 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-14 05:24:47 +00:00
Treehugger Robot
2f6b7bea9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb12eb052e8ee0110647f55a86e0f365bc98017d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:14:11 +00:00
Bill Yi
39dbfc2e78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a26cc2c6943e2791a0d632b831cfe086067bdbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:14:08 +00:00
Treehugger Robot
e2ee732578 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4c331a763becd473d4fcb399e1d548c1fd1a334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:09:36 +00:00
Bill Yi
a49576b187 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28779f4e321c73a8ddf81f0a9c0659359e5c9a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:09:32 +00:00
SongFerng Wang
286344d539 Merge "Remove the owner" 2023-06-14 05:01:51 +00:00
Treehugger Robot
189c459359 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: a7bcd85abc -s ours am: b487b83d47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3565f06ebad6a2b2177c09c4d35fdcefa3aa9fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:53:09 +00:00
Bill Yi
66c78bf0e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: ee15b19128 -s ours am: 5f253d4f54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9decaf180ca6e2b352db0df1f1978e6f854612e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:53:03 +00:00
Treehugger Robot
2c3d366a45 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 3ea3bb83ae -s ours am: f883c87710 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib50ede06524cd6fbd789d4ce577dac289e4d01e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:52:58 +00:00
Bill Yi
51559e3d71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 0138ef4a5e -s ours am: f77ec98dcb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic29f4ff30eaada5fcd0baf52337de571a8e8fb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:52:39 +00:00
Treehugger Robot
8cf7ca0d1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 41bd0f8ae1 -s ours am: fba5dceb82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6a9784026e9306e4d06861ff94908d8c14483c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:52:20 +00:00
Bill Yi
025fc9e0d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: bd6c412717 -s ours am: 79192cfe1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5076ffad4c5df220bdc424209dc79ece685915a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:52:03 +00:00
Zaiyue Xue
64665795c2 [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 -s ours am: 8cbeaf6a74 -s ours am: c27cd42a1f -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I978e5031e45f399b64bf733d5c8e63d02bdbbb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:51:25 +00:00
Zaiyue Xue
37329a1775 [automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc -s ours am: d593cb5284 -s ours am: 7bfd068d24 -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I2a8ab7f6daf55385d8dccdcdce9f193dde2158d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:51:23 +00:00
Treehugger Robot
2179e44ebe Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc am: f47dbe3bae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I37b5082e932c4141dcb3b277c84b096d93ffb3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:51:15 +00:00
Treehugger Robot
2db2e2c8ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: 7e88b1ed07 -s ours am: 10abf2f63a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida81c1d241df32714205d9d046db51a308c055f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:56 +00:00
Bill Yi
809905795e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: d0d5c9d84c -s ours am: ef7c503634 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8daac4f5ac5f61a135966a4bbd0a2e721cf61bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:49 +00:00
Treehugger Robot
82a566dff7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 7930f72c4d -s ours am: a411c734bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9eb882025e8da62dc8119a7c5aaf5ee78634905d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:49:46 +00:00