Commit Graph

108284 Commits

Author SHA1 Message Date
Bill Yi
3cb32143f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours am: 6d50c8f7e4 -s ours am: 160c53780a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56cd62cb86aeb85f78b23c8dbb8422d4c6ddf593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:30:11 +00:00
TreeHugger Robot
357ed2aeba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours am: 6ea0bfe56f -s ours am: 8475dc0060 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I846bfba68e20bec6f1871c2685c0b03fd792272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:26:50 +00:00
Bill Yi
ef8450975b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours am: f2768dfaf0 -s ours am: c3cfb013da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8912c6b4a1e9ffd1f14f5f0d74afbc78e2a83aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:26:45 +00:00
TreeHugger Robot
f838438a74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours am: b0aaf6a61d -s ours am: c0dc5f7598 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I274c547e972e3a20444d81e417e9d1df1a1ec695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:26:31 +00:00
Bill Yi
af43d0d34a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours am: 6d50c8f7e4 -s ours am: 066686f5a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e228683b900c69f189dc11a97db4c55ed9b7393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:26:21 +00:00
TreeHugger Robot
d9a8ed871f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours am: 763c57727e -s ours am: 54e6e890c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66dcddbca569acaab9cb74ac369ab81b49960bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:22:20 +00:00
Bill Yi
e81c2c0594 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours am: 7ce77f731d -s ours am: 6456bec4e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34bed5ecfbde3b461ff1b91f077e6cf259d4a15e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:22:15 +00:00
TreeHugger Robot
bb9d88daac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours am: f76d513bac -s ours am: f4817f1097 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a1a59d54ae1260a07ff1f91bc5654e823371d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:22:01 +00:00
Bill Yi
7a12d074eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours am: 1e7ec9488d -s ours am: 9d1a4bed68 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e7c3572db64997e0bf97d24527fe7631d833d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:21:50 +00:00
TreeHugger Robot
8475dc0060 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours am: 6ea0bfe56f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5328c5cf9054c4002c60e79ffae2c72ab1d687d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:06:16 +00:00
Bill Yi
c3cfb013da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours am: f2768dfaf0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1dc62ea5b5fd3a4596366a9ff57a91232ead8113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:06:13 +00:00
TreeHugger Robot
3d23905e66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours am: 6ea0bfe56f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb704503d1d60171c5c46fdf88659cd59db73b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:06:10 +00:00
Bill Yi
8e1a824f59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours am: f2768dfaf0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fd0563167d650766b01d071f2a7e9fc04e15143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:06:08 +00:00
TreeHugger Robot
c0dc5f7598 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours am: b0aaf6a61d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib4c6a570fc509e577fbecbcfc855f84b93a19c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:06:00 +00:00
TreeHugger Robot
f3ccada704 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours am: b0aaf6a61d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07e0f60225a79141b654879b719ff349acff6a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:05:57 +00:00
Bill Yi
066686f5a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours am: 6d50c8f7e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c6d3c6f3cfa756204edbb4a386dc3d3526e531b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:05:48 +00:00
Bill Yi
160c53780a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours am: 6d50c8f7e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd680c08b3881a6a0d0047a19ea3db7989e012ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 23:05:40 +00:00
TreeHugger Robot
54e6e890c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours am: 763c57727e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I125741f0bd2432eaac7f1cc810a2439a5b9017ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:57:59 +00:00
Bill Yi
6456bec4e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours am: 7ce77f731d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07231d644c2d798be3cd458e624ff02a390bfbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:57:55 +00:00
TreeHugger Robot
f4817f1097 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours am: f76d513bac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia53713a7e2bd721b10f1ce6a2724456b40855d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:57:42 +00:00
Bill Yi
9d1a4bed68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours am: 1e7ec9488d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e53894de90192507042738ec046e0db047b7525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:57:30 +00:00
TreeHugger Robot
6ea0bfe56f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I978d776120bd385cf5c0bca12ac2963653d9e81e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:37:46 +00:00
Bill Yi
f2768dfaf0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2738b7129e3c4ef609775f78a6e077285096a510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:37:43 +00:00
TreeHugger Robot
b0aaf6a61d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26f6696779ac63c7c3e3ba6dd79e0b151dab561e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:37:28 +00:00
Bill Yi
6d50c8f7e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fcf322dec36c2839b3de64c392ec649ed24c309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:37:18 +00:00
TreeHugger Robot
763c57727e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4ee7e4ef6b3a1a8abe5b1b0b91c1b9d45cb69bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:36:16 +00:00
Bill Yi
7ce77f731d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d1fed1764f95efa440204ca2ba4b49d1e95d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:36:14 +00:00
TreeHugger Robot
f76d513bac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia24aa647669b45543c89a0ff544208c56fd5fbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:36:04 +00:00
Bill Yi
1e7ec9488d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f144c74d50937adb49ba867bfbbeda127a5e1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:35:47 +00:00
TreeHugger Robot
de76b7c0c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic47779d59e4d97f612b17ed40388386030d2df8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:12:45 +00:00
Bill Yi
e725f74df6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f371ab53ed6773a539e2f02e08917c978f080bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:12:40 +00:00
TreeHugger Robot
eb1fac17dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee783066fa19d7cdbb69ddc1914798fc46233da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:12:30 +00:00
Bill Yi
26aaae4b33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5711ae485881b9dfb32a0da03bf07c48210940f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:12:13 +00:00
TreeHugger Robot
a28bac49f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-30 21:51:15 +00:00
TreeHugger Robot
4fe2b9284d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-30 21:51:15 +00:00
Joshua Mccloskey
f18225e8d4 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: c45744b895
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ic22dcf1dee20c8176aad428f8aa7d33d7f24ae55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:32:01 +00:00
Joshua Mccloskey
8b6d40e167 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: I4513264127184a92320636fee5cdf48e84ec7752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:31:30 +00:00
Aleksandar Kiridzic
82ef1ef6db speech: Add on-device speech recognition settings entry
Currently under `Settings > System > Languages & input > Speech` there
is a `Voice input` entry with a cog which starts the SSBG model manager
settings activity. Under the same preference group another entry
labeled `On-device recognition` is added which would open a similar
model manager settings activity, but for the on-device recognizer. That
settings activity is yet to be implemented.

The new entry should appear only under the following conditions:
 - An on-device speech recognition service must be available in the
system.
 - A speech recognition service with a proper settings activity
meta-data must exist in the same package as the default on-device
speech recognition service.

Bug: 235457391
Test: Manual, already existing robotests
Change-Id: I17208c8725500ccb3dd2fa51a12b003d32073c4e
(cherry picked from commit 31473663f5)
2022-06-30 19:12:07 +00:00
Joshua Mccloskey
c45744b895 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: I85ffc3d2738d7398b261c48f27cf29c84c328f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:06:54 +00:00
Joshua Mccloskey
93f79d6774 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ibf89a7a3b58f076d694e2582ffcd950f5cc54142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:06:42 +00:00
Joshua Mccloskey
c99fa169ca Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev 2022-06-30 18:49:06 +00:00
Bill Yi
ac73a2f10f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I828baaa165b4b83e91890f75779f3d2681d81f88
2022-06-30 03:06:58 -07:00
Bill Yi
36728d9972 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5d207b4e02f4cec681b3182eb103058c2af54e27
2022-06-30 03:02:57 -07:00
Bill Yi
a140e645ff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib82da5ad9567b72f5a152893d397cafb736f0037
2022-06-30 02:54:36 -07:00
Bill Yi
d642b8754c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idaa60c0a1a599d60559c2610ffee17880bc5763b
2022-06-30 02:52:59 -07:00
Bill Yi
19777b98cc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3e02d79532f2ccbde6d2f6716ba6991ab6945dd2
2022-06-30 02:51:14 -07:00
Bill Yi
3775e246dc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id0a25d2b31fee26b7f9ca2c9b45ed5128c064d00
2022-06-30 02:41:16 -07:00
Bill Yi
b107521284 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0fc17cde5466fe2346434ee2741d614c8c7fd2ba
2022-06-30 02:35:43 -07:00
Jason Chiu
8b8af21cec [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: fd87b73bce -s ours am: bbd4ba6097 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7899a2aa45e74ea26d1de42091a703190156cc33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:38:02 +00:00
TreeHugger Robot
9a2c8f1aa7 [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 95dd3a91fc am: d7d9010c66 -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 846d0286a8 is already in history

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

Change-Id: Ica48802f654a9f5327150dfa916186bf56bb3092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:37:56 +00:00