Commit Graph

106357 Commits

Author SHA1 Message Date
TreeHugger Robot
d27c2dbda2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours am: aceb22d536 -s ours am: 70918a2ae2 -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: Ib343febf794ed19aa89d417c73089216d0f668a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:14:01 +00:00
Bill Yi
026cb3862c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours am: c9b4aede2b -s ours am: 9b5cdf865f -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: I490ccd1bd12bb1f078d9436fda8eaad1d16a10a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:13:53 +00:00
TreeHugger Robot
46a606aaa3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours am: 011098d8c4 -s ours am: 9cec02505c -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: I8acbe95a87aff4ea739a03ccb2cc6aa9adb0fafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:09:27 +00:00
Bill Yi
4d5a76fd5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -s ours am: 1f3bfe46d6 -s ours am: d7fb82b9e1 -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: I7eb18bd5b6de9dc27d012090632a0ea322f3c4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:09:10 +00:00
TreeHugger Robot
d76a6f4cde [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours am: 982553d4f4 -s ours am: 155855fb5a -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: I8501f40a9ad6e83379996bb8add86bb7c0b6ee45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:52:47 +00:00
Bill Yi
49884323fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours am: 3ae3da42e5 -s ours am: cd779d5f34 -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: I7faf0f0f043bb41abf69c788856639f58e952d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:52:32 +00:00
TreeHugger Robot
029c0dc147 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours am: df51e88c27 -s ours am: 2b07d43d13 -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: I6a23258abd3b8b3c985d5789741e5423a611e2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:46:56 +00:00
Bill Yi
bd761bf6ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours am: 21ea9a9a7b -s ours am: d78b644ba5 -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: I9bd85d77598050b637315e504ed7184c229949bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:46:39 +00:00
TreeHugger Robot
dc21cc4a05 [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: d44eab09af -s ours am: fb5731b0ef -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: I3dee9841443bb090924e4a656ae2bab400fa844a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:38:39 +00:00
Bill Yi
97150aea2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours am: c439ac1427 -s ours am: fb6f7d4227 -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: I06b900d0457ba4a087c68622fdc91cff9338a613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:38:32 +00:00
TreeHugger Robot
1e7dd9e92b [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: 6d3bc56921 -s ours am: 7becd84698 -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: I6f1e44d07b1218b8953bca4f06daf12b745105e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:34:45 +00:00
Bill Yi
738a9edbf0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours am: e0f893656b -s ours am: 6c517e8a0e -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: I3abb7c633501aec6f701cc600145e01753e49251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:34:25 +00:00
TreeHugger Robot
eb424e22b9 [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: fc6b26986a -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: I44eb9a9b967fcc0c1f6f8065cf1f8f827e32002b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:17:13 +00:00
Bill Yi
e4b326fb64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours am: fb4c665f17 -s ours am: b674d0e496 -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: Ib6c5b16e8adacc740f1134e309f0a75307768df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:16:58 +00:00
TreeHugger Robot
32e1e356bb [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: 844a81ecd3 -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: I7f096c6c6bfc2f2beaf1acba7371d5eb5c448e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:13:10 +00:00
Bill Yi
d0528993c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours am: 17910cdfa7 -s ours am: 165c951d8a -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: I81b852f2fef71b1335ef022c9a4cef762482115d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:12:52 +00:00
TreeHugger Robot
70918a2ae2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours am: aceb22d536 -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: I0c0f9c962c3d006839d3df2c7beb0680d68342d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:04:16 +00:00
Bill Yi
9b5cdf865f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours am: c9b4aede2b -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: I5f29e52332480c2d36ef2c1a0ba7d2362ba4ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:04:11 +00:00
TreeHugger Robot
44702438ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours am: 341a2953e8 -s ours am: b6a4be3395 -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: Ia12c76dbb7c75c73bd6bf2e837c1797a029a05f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:02:58 +00:00
Bill Yi
b107724c44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours am: bfb7bb08ca -s ours am: 0cc0806e01 -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: Ic7bf2cb9d7ad2a8e8850d2e54a637f1556c09072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:02:46 +00:00
TreeHugger Robot
9cec02505c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours am: 011098d8c4 -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: Icee5b1aa0514bc1309b1e470304b24169bfa0864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:02:31 +00:00
Bill Yi
d7fb82b9e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -s ours am: 1f3bfe46d6 -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: Iac803e62c241ff01cce212ac0068862eefa852ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:02:18 +00:00
TreeHugger Robot
aceb22d536 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -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: I733a059f3c768b428b30f37f3bd76970d68a4162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:53:39 +00:00
TreeHugger Robot
155855fb5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours am: 982553d4f4 -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: I298a5731ee5ad9b70c2fa27f19cb95c9436f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:53:33 +00:00
Bill Yi
c9b4aede2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -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: I49f55737ab561348ff8cf07e7ee6bba4c4958b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:53:31 +00:00
Bill Yi
cd779d5f34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours am: 3ae3da42e5 -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: Id32cfc9220f693e1f409e27b71371f68f65511fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:53:18 +00:00
TreeHugger Robot
011098d8c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -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: I99354e81b48f43663eca100aecf5a6ffba349b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:52:06 +00:00
Bill Yi
1f3bfe46d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -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: I95fae25faaaa1ef0b40a6322adea8af4f1fd17b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:51:51 +00:00
TreeHugger Robot
2b07d43d13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours am: df51e88c27 -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: I17fd3c94ea532929b7a30e3b283921939e33e5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:45:08 +00:00
Bill Yi
d78b644ba5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours am: 21ea9a9a7b -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: I7239a06eacdd0bba6337a648fe8aa5a908a89cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:44:50 +00:00
TreeHugger Robot
982553d4f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -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: I1d7aea199fe2084c8f534e9c9a8a142f0984411c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:43:11 +00:00
Bill Yi
3ae3da42e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -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: Icbc04b1dff3053ae4e7892773b1e7b98e7cfc6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:42:47 +00:00
TreeHugger Robot
df51e88c27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -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: If14640fd4446fac12944fa264005cb875fc36a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:40:32 +00:00
TreeHugger Robot
fb5731b0ef [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: d44eab09af -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: I107a01d1892ad71be75aaf348c9e2db5f5a6ac6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:40:26 +00:00
Bill Yi
fb6f7d4227 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours am: c439ac1427 -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: I20fda5282c165374766f58f9ece1a4e5d212b2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:40:18 +00:00
Bill Yi
21ea9a9a7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -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: Ic2d92581c207be3dea7fb1146b15a9430ef76dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:40:02 +00:00
TreeHugger Robot
3d09370874 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours am: 053bd1f8ba -s ours am: 87e365c6e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7dac57e144b7923cba92280f4177822c2b07e836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:39:49 +00:00
Bill Yi
ce54655a86 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours am: 1025a9751f -s ours am: 7f13849ae7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20f735aa75b2b0a551ca6e7a91c6dacd42af6e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:39:36 +00:00
TreeHugger Robot
7becd84698 [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: 6d3bc56921 -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: I7289ef35901140a7c9e34d462a8466f723185a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:38:19 +00:00
Bill Yi
6c517e8a0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours am: e0f893656b -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: I3cbcb20c522a1f41ba18508253cd0203e37f2255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:38:05 +00:00
Bonian Chen
17cd93dda6 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: cf9ca3fbe6 am: 61c633f9a6 am: 7ca3689b23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Idf25823050ca40fb61e2acbb46d8845ccc4f810c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:15:12 +00:00
Bonian Chen
290fcb2d92 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf am: b0e84295b6 am: a277c7a641
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: Ib7211d7d26fa42cb2ce3d9e05a1caea5b073ca92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:15:05 +00:00
TreeHugger Robot
49b4e561ce Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: 23dab0bb02 am: 24f5f6d56c am: 1e3ddc9460
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: I6224ed9bc02b8fd4d8e5ed658910e8cc93796148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:58 +00:00
TreeHugger Robot
3267ecd905 Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354 am: eacedb46b2 am: f606826199
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: I4cf8ccc1a2af594e37695c026d71af4d0592f0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:51 +00:00
Bonian Chen
dbe9e47dd3 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 99724f3a70 am: b2e6fce2fd am: b88cb65959
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: Ie9f1ae37880c51b0a7f412dc31b9f581a0d816cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:44 +00:00
Betty Chang
2f0a80e91c Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: b1fa93e7ef am: d7e9bcc43f am: 166d876738
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I11375b91dbae7517de8112eceeec201d28620f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:37 +00:00
Edgar Wang
22ffdce6dc Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 22f7ab59c0 am: 2336ad01a9 am: 05255129d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: Ie5ba27d08856248a19e971137cca769fdbf0c66e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:30 +00:00
Bill Yi
a4fd20322a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours am: 41b6a6c820 -s ours am: a82a1ff84e -s ours am: 2e250b15ae -s ours am: 7cb788de49 -s ours am: c1eae1df36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68a151896abdde270594e20c8a5c777eb7318641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:21 +00:00
Bill Yi
fb0a63c139 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: b8d61f99e0 -s ours am: 10abd90819 -s ours am: 4cef0633cc -s ours am: 61f36c7be1 -s ours am: 447f3eb1cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3363283015617daee1cdd71b336a104bd8a26a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:11 +00:00
Bill Yi
9c97f931c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours am: 5568a2692b -s ours am: b17e079014 -s ours am: ad0ba2cc9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3da149a03e05d445c7d92dfc5e655665f01f241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:14:02 +00:00