Commit Graph

106591 Commits

Author SHA1 Message Date
TreeHugger Robot
40472f831f [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c am: 303c6f3cac -s ours
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: Ic3f98ad45cbd9236e8287c0cf07cff507033a667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:15:11 +00:00
Alice Kuo
9dbce75768 [automerger skipped] Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e am: b8b79e0574 -s ours
am skip reason: Merged-In I2d650eb315790c3efc7510d9e125aeaf4464cda6 with SHA-1 b13abc03dd is already in history

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

Change-Id: Ib3a8ffcbab86e98d96392d3ae5a48d9b6820bfcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:15:10 +00:00
Alice Kuo
df44228ece [automerger skipped] Add LE Audio feature switcher in the developer option menu am: 948b7cb959 am: b045c57fe6 -s ours
am skip reason: Merged-In I8adcf27edd1438df445d32fca93f35ff5020a3b3 with SHA-1 0d11fd07e7 is already in history

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

Change-Id: Ia8ff483a5dee22c85d04ad3884f7ffc1699e1533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:15:08 +00:00
TreeHugger Robot
303c6f3cac Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333

Change-Id: I30105608cf552ec60582cb296179b9cd94b6d66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:00:25 +00:00
Alice Kuo
b8b79e0574 Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740332

Change-Id: I2200a81b0d63cc690b475e5eed43e6f3e9f49ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:00:24 +00:00
Alice Kuo
b045c57fe6 Add LE Audio feature switcher in the developer option menu am: 948b7cb959
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331

Change-Id: Ia0fa92a5061bdb75a648dbb3d8db9fd2bcbdb1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:00:22 +00:00
TreeHugger Robot
671c65235c Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev
* changes:
  Grey out LE audio offload switcher as LE audio isn't enabled/supported
  Unify the LE audio string and refine the layout to put LE audio switch together
  Add LE Audio feature switcher in the developer option menu
2022-06-07 03:37:21 +00:00
Alice Kuo
b51ae97810 Grey out LE audio offload switcher as LE audio isn't enabled/supported
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
Merged-In: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
(cherry picked from commit f71b2ea56e)
2022-06-07 09:43:08 +08:00
Alice Kuo
ed1a79a97e Unify the LE audio string and refine the layout to put LE audio switch together
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
Merged-In: I2d650eb315790c3efc7510d9e125aeaf4464cda6
(cherry picked from commit b13abc03dd)
2022-06-07 09:39:25 +08:00
Alice Kuo
948b7cb959 Add LE Audio feature switcher in the developer option menu
Add a switcher to enable/disable LE audio feature. The switcher could be
enabled by setprop ro.bluetooth.leaudio_offload.supported=true

screenshot: https://screenshot.googleplex.com/6aGP664S9PX5EMS

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I8adcf27edd1438df445d32fca93f35ff5020a3b3
Merged-In: I8adcf27edd1438df445d32fca93f35ff5020a3b3
(cherry picked from commit 0d11fd07e7)
2022-06-07 09:36:15 +08:00
Automerger Merge Worker
df27efaa8e Merge changes from topic "am-25f6a72642164283be9362e18a8e52e6" into tm-d1-dev-plus-aosp am: d86ace768b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296

Change-Id: I46cbe667e3d1961b9b66f0c605266fdb38478bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:08:23 +00:00
TreeHugger Robot
6e61a46bf4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 4322a2ffea -s ours am: f1e2b557bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I167c2cfa96bf06bf12eaab0f9c5b8e5d505f84f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:08:14 +00:00
Automerger Merge Worker
d6b1cd7123 Merge changes from topic "am-57e0d74080e946758c2b4cbce9ad25bc" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours am: 688597e471 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -s ours am: 2c9fda98b1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -s ours am: d11e1a39a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -s ours am: 6e565398ba -s ours
2022-06-07 00:06:09 +00:00
TreeHugger Robot
e064dd08b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours am: 688597e471 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6402201434024b399c6b056d7ed01c81fa626bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:05:07 +00:00
Bill Yi
8f95f871be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -s ours am: 2c9fda98b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e501d108b0402685f65d0e7fd57446be1e018b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:05:03 +00:00
TreeHugger Robot
0c8b430341 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours am: 150bdf72ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e3176f12214a010682e6f7c2f60a9603194be02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:04:59 +00:00
TreeHugger Robot
2ed5936d64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -s ours am: d11e1a39a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id96309ffcd45c92caf796053074f2c0a151a5d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:04:57 +00:00
Bill Yi
03bb2b929d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -s ours am: f190bf482e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22175f15655ec9d8cbeeb8f397162645eaf4fcd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:04:54 +00:00
Bill Yi
f7e2dff72f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -s ours am: 6e565398ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb41d0cf85c1c97e9db77ebb4c626a76fd22ac7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:04:48 +00:00
TreeHugger Robot
bd72b20ae3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -s ours am: 5018fa585f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief132e9e8db60739abf41242c3b0956c5dbb1192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:04:47 +00:00
Bill Yi
77cf1488c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -s ours am: 3d24ab77c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida3620db9317fe2ced5a6a450a287ea2e22eb584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 00:04:36 +00:00
Automerger Merge Worker
d86ace768b Merge changes from topic "am-25f6a72642164283be9362e18a8e52e6" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 4322a2ffea -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 6de51e9b95 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: d3bd17b345 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 702b4bdc85 -s ours
2022-06-06 23:42:40 +00:00
TreeHugger Robot
f1e2b557bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 4322a2ffea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e36f278c03ffacafd4a88e4fe37b4eb057d9538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:42:03 +00:00
Bill Yi
d30ad5252d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 6de51e9b95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20a6367f052fb5defe74c611e48cadf0ccde985d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:59 +00:00
TreeHugger Robot
150bdf72ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb944e8a97433fe3cfb19bd0f5676828267f02ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:54 +00:00
TreeHugger Robot
688597e471 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1b56ca270926c7d12f645116131e2c546d26758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:54 +00:00
TreeHugger Robot
e9509eae1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: d3bd17b345 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie97c75d2416f9b50be1a58d3b628d4a6a0bf1a07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:52 +00:00
Bill Yi
2c9fda98b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8282d7a75b4f0419fcbbea89f353cf1a4e95614b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:51 +00:00
Bill Yi
f190bf482e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c7f9d6cdde40aeccbfda9ac03397f9e20211123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:50 +00:00
TreeHugger Robot
d11e1a39a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie40bb274f4b67fa2fdd60c489bd1ddd56bbcb408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:45 +00:00
TreeHugger Robot
5018fa585f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e222d6f066439628e05276ac48eacf8f03ec8b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:44 +00:00
Bill Yi
5825f3efbc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 702b4bdc85 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ad2a18803893738f87d9199a7517a4435e3e004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:43 +00:00
Bill Yi
3d24ab77c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia32a0c98a122030268e1a52ab1ad7d62eb4974d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:36 +00:00
Bill Yi
6e565398ba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc564a94557fb27d8dc838ce7dc753b33adc9873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:35 +00:00
TreeHugger Robot
7f6ae2418e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifef4a88d1a87bee4c7344bedc11dacf39c759d5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:15 +00:00
Bill Yi
082d0f39ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If89daeeef0f850ebea96138e384d8b099692c34c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:11 +00:00
TreeHugger Robot
868a03b273 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I928b177a20dfd288ccacf2512764b3f067f15108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:03 +00:00
Bill Yi
59bb14f56e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I449a641ddef3e8f3ef0c961be79f23a7da760a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:20:56 +00:00
TreeHugger Robot
4322a2ffea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1e2168fa829912acd8a56b6d4912f9424c35faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:19:46 +00:00
Bill Yi
6de51e9b95 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8a14a4ce53b637baee387d5af0844df01937828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:19:42 +00:00
TreeHugger Robot
d3bd17b345 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic77b5f19c3711be07cc88a803e318fba40b29fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:19:34 +00:00
Bill Yi
702b4bdc85 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic65ceb2f7a4f50d7584be3d596d64b620af20d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:19:29 +00:00
TreeHugger Robot
3de5617a68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a89dc3c0ffad10dec24003198409aad5b174182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:21 +00:00
Bill Yi
2036b1873c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ic3a2da03399dc35e01360df7c323cb3b5b68808c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:10 +00:00
Bill Yi
26d22ef04d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1286629b18bae7a7a76bd4c96fc3b3d33cf559db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:00 +00:00
TreeHugger Robot
725c53880a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
e852811d18 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
2f7607e362 Merge "Restrict network preferences settings" into tm-qpr-dev am: 5afb322f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18702206

Change-Id: I6ab51f8b19893985160d0f46978199293fc52cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:00:03 +00:00
TreeHugger Robot
1f253bd647 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 4154883a76 -s ours am: adde365e6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I128ae596e47afc65e37c4ec0c209178db95611af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:58:42 +00:00