Commit Graph

107051 Commits

Author SHA1 Message Date
Lucas Silva
db8221c3c4 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: d7e5195565 am: ce24de4631 am: d58d7aa5df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: I54da25f355443a7abd5784eacd404b1b71a43d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:13:08 +00:00
TreeHugger Robot
f1481f2c07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 73c4650b74 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f306dd09a81e245538a8af047b020f38ff968b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:13:07 +00:00
Bill Yi
c439ac1427 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbec89e7128f1a4e35d559084ad6ac9f05c890aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:13:05 +00:00
Bill Yi
3f1bb46ee6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9fe0142ec92ef47836e2cbcfa9f10fd8876d9e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:12:58 +00:00
TreeHugger Robot
6d3bc56921 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 1ee8289cb3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I63cf4f7ee4d5e54c357ccab9088f055dbc757dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:11:46 +00:00
Bill Yi
e0f893656b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9696671d38eb14d84690fc5aa44a88ba34c30a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:11:26 +00:00
TreeHugger Robot
e9c68c612c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 1ee8289cb3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d9dc85ea8fe9ae63f47dceac64531b5a0e0f6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:10:29 +00:00
Bill Yi
53cfc36f8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88f1c5299c04f3cb1d845b3c7109c08ac86281ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:10:15 +00:00
TreeHugger Robot
73c4650b74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id59d43c8c53c63a709e36f992bee85197e9a8ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:38:56 +00:00
Bill Yi
eb50f1a254 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7b564875eecc19522472038cefe5b1a8ea08dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:38:45 +00:00
TreeHugger Robot
fc6b26986a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: d903116617 -s ours am: 872b52eba8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I404cd3742b125d1afe37d6714e26d1e74a907c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:36:26 +00:00
Bill Yi
b674d0e496 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours am: fb4c665f17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic36574d5bbd7b20dfbdae78984ea54fb6942890a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:36:09 +00:00
TreeHugger Robot
1ee8289cb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ac007f97fda9508ad841aecc10f5cf77c8d253a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:35:42 +00:00
Bill Yi
1473685f22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5377c4e960d84a8496ffc2f4d96f4f2814dada0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:35:26 +00:00
TreeHugger Robot
844a81ecd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: 56012b6bb0 -s ours am: 491facc411 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6028e9551511afd69bf79532e8428399ed00197a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:33:57 +00:00
Bill Yi
165c951d8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours am: 17910cdfa7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05c0733b5fe53a9d684733842d066d4279c6bad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:33:38 +00:00
TreeHugger Robot
8fdc4458ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3f2354c9162e2f155a48674ece71a3818db6813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:31:04 +00:00
TreeHugger Robot
7297e1991d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10c6bf331fbf61de2a5f93408d9c9f91f40c27fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:30:56 +00:00
Bill Yi
16fe14a809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2f2ee63bdb5059029e9aa70ae5473f6b11ac388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:30:55 +00:00
Bill Yi
bf2202976c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide9e9a51d6cbb909e6f83c6f2a16b8ac5bc10204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:30:47 +00:00
TreeHugger Robot
8d0c594d9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b982ba5a359b3fdfb967062d7222ddde50fed9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:41 +00:00
Bill Yi
81d691ad75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I90fed578680f055d43975a90f3a5e1c2162908c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:25 +00:00
TreeHugger Robot
e2dded192e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I869ac4f4950d8517b0a282bb5a7348060291769f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:25 +00:00
Bill Yi
019a2d163b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb22933910b099be0f8e67c1de001a4e29323cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:10 +00:00
TreeHugger Robot
9f3bb460f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: d903116617 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ca01af85aea7429589bb53db47df0b0d2b6ca69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:01 +00:00
Bill Yi
7253c76644 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1858c90d1ae3c6f6427fd30d9569d4a9832af40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:27:45 +00:00
TreeHugger Robot
872b52eba8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: d903116617 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I556af03d375ff551abb586e1ad93980aaea256db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:27:10 +00:00
Bill Yi
fb4c665f17 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10de6dc1e0929cdfb8804c65f435662455e9ea24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:26:54 +00:00
TreeHugger Robot
eab445ee93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: 56012b6bb0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I834a904f566ecfee2525a43550c361f8b0b7599c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:24:50 +00:00
TreeHugger Robot
491facc411 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: 56012b6bb0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia184037830a730132546fcc124ea57b31dd847b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:24:49 +00:00
Bill Yi
17910cdfa7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f22457acc29a66c5caddecc896a4c3988061e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:24:30 +00:00
Bill Yi
af6473ec92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f7aaed797f0254e059263fd38d6da922e0eeb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:24:29 +00:00
Joshua Mccloskey
5a761a8198 [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours am: d7855afb3e -s ours am: 2dbdde4582 -s ours am: d9987e0e0f -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I3fd0ebc17bc9c03104885fc490432fe6f9f58953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:56 +00:00
Joshua McCloskey
9c5d9991c8 [automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours am: 8495275d81 -s ours am: e63e2c4483 -s ours am: 19cc020f09 -s ours
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I4d1e5d5452815bfb7968d46e910716a9037eb1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:54 +00:00
Bonian Chen
03c63525b8 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: b32415b955 am: 907156d04f am: 0d3883baa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Ie34e03b41b9abfb787cd25b66b55bdc719094ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:39 +00:00
TreeHugger Robot
d903116617 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1f09bfbaf3df7feed03fd2585032e063626c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:22:45 +00:00
Bill Yi
471a93781b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd3d6ecae92bf38cde1fc6a83872a7ec366b73cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:22:27 +00:00
TreeHugger Robot
6389cb3f8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaecdd3202593c7f84cd6e779d79cac5d4edd0742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:20:24 +00:00
Bill Yi
74507642b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d4df6d4ea79c3aa509a10574d8f041b4837e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:19:57 +00:00
Bonian Chen
10ebbc8cc3 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 01e97e371e am: 2718dea3f8 am: 409e87760d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: Icc6b3133ae8e4bd3d1fb53d38d14590823d88aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:54 +00:00
TreeHugger Robot
c829be9ed7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I174f698a6651063795fd84edaddb8e3bc25ad2b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:52 +00:00
TreeHugger Robot
b6a4be3395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours am: 341a2953e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd683fee3e8d302c30946460f852e4110d54dbc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:47 +00:00
TreeHugger Robot
a1c78fb744 Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: d1c67e389d am: 5c851b28f7 am: fbcb6198ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I6514ff6216854d2b5a1ec71c3c777fa3ad4f20ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:44 +00:00
Bill Yi
1446433485 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36758de26bfd43ec686704af56bbc72417802bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:37 +00:00
Bill Yi
0cc0806e01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours am: bfb7bb08ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0a9b6105e134395774500bff1f86d4f3dbfacf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:36 +00:00
Jan Tomljanovic
205aef1cb5 Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: 3c357dec8a am: 1ef1f750e8 am: e228d4e72d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: I96902fa4e606d45835455521fc2456d573b133ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:33 +00:00
TreeHugger Robot
485a0f01ff Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314 am: 431c7ede2b am: 3d4ffc67d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: Ibb698f3d818c78996ba7da9d13462168c31956c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:23 +00:00
TreeHugger Robot
f32c08af1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0123563e51c4dc282e0aba58fb51d08980f9d40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:22 +00:00
TreeHugger Robot
0c0d2fa0ba Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 7d1f75839d am: 5ed72fae84 am: 070850b528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I828ac0530a2967162822f460248c6560c8665853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:12 +00:00
Bill Yi
ee38ae11ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I90d9567d06f163e2e47a6ad7522f86355ecc272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:18:11 +00:00