David Duarte
6fd428956e
Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
am: 889aa2cdda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176
Change-Id: I848b57bccf9b4cd3774fd367db1053146c54358c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:11:56 +00:00
David Duarte
889aa2cdda
Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176
Change-Id: I021a71139d6cd453735e279167984863b982dbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 22:26:34 +00:00
David Duarte
2920cad66f
Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev
2023-05-18 21:58:59 +00:00
SongFerngWang
d010dddaa0
To refresh/register/unregister all of the devices with same groupId am: ef7a75c394
am: be615f9351
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381
Change-Id: Ia91ac1f46d96ff04e75fcc5e9c52da6bacfbc584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 11:13:45 +00:00
SongFerngWang
8b35fb1a1d
To refresh/register/unregister all of the devices with same groupId am: ef7a75c394
am: 64281594d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381
Change-Id: Ie19c94f9bc88263312d1e1d1ac0c6c728993b7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 11:12:02 +00:00
SongFerngWang
64281594d1
To refresh/register/unregister all of the devices with same groupId am: ef7a75c394
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381
Change-Id: I715fcfd8d93f557a485b2caba663fd8bb40851f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 10:31:41 +00:00
SongFerngWang
be615f9351
To refresh/register/unregister all of the devices with same groupId am: ef7a75c394
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381
Change-Id: I2b7c50fad0b06cbbe5d9417d136feb498d1f112c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 10:31:39 +00:00
SongFerngWang
ef7a75c394
To refresh/register/unregister all of the devices with same groupId
...
Since the LE audio have two or more devices in the same group and
the UI show their status at one preference, the UI need to register
callback for each of the devices, and also refresh the deviceList.
Bug: 278155752
Test: local test to pairing the device and check the battery part
Change-Id: I2fcde92a1f68b8437465b234820f7bad13dfc444
2023-05-18 16:28:52 +08:00
Daniel Norman
cd868ca92b
Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d
am: 9b6494cfcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499
Change-Id: I3529eb71d47271bebf4d30837dd4802a811516aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 03:39:13 +00:00
Daniel Norman
d7f544572d
Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d
am: 5a48445bf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499
Change-Id: Idda4f7602d7bf921ed74995bb9c39f8bb3d21ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 03:39:06 +00:00
Daniel Norman
9b6494cfcb
Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499
Change-Id: If405f63827deee2908b1366bf3099274d76debfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 01:33:30 +00:00
Daniel Norman
5a48445bf1
Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499
Change-Id: I1764ea065f17a3f1ddb01739d8bc6036ee377b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 01:28:39 +00:00
Daniel Norman
aa46e3d39d
Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev
2023-05-18 00:39:50 +00:00
Treehugger Robot
55601a3d22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours am: ef7d5b407c
-s ours am: e476d48fc7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I8d21cb9a21de8208af4fc9e0b2302579a41e58e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:09:13 +00:00
Bill Yi
b6ef1bcae4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours am: 1686903bde
-s ours am: bf2f91de1f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I5887c44b6e83d4558a2995a4fd2f94acf13f6017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:09:08 +00:00
Treehugger Robot
4366d87cbf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours am: 2722d0887b
-s ours am: fa5b9dc846
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: Ia8d23ef02259254b4d10105db557920d7df74914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:07:07 +00:00
Bill Yi
5f7c7d56ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours am: 66dc9d023f
-s ours am: f24204bb1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I471870c42d120e4bc3b35c8294b190482c50cc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:07:05 +00:00
Treehugger Robot
e16005ac8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours am: 2722d0887b
-s ours am: ae18b5b863
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I7c505fa3e2320a877571703190df24a638be3b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:03:53 +00:00
Bill Yi
f019df166a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours am: 66dc9d023f
-s ours am: a2a2d5875b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: Ie2f9a1c2da668b5edba368946dc02bb807ebcd27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:03:50 +00:00
Bill Yi
cec5098f19
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21
-s ours am: f6ece5c0ab
-s ours am: e0b712d439
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: I73a3ccbf6424cb1f57f35e6e3b3581150d164808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:03:21 +00:00
Bill Yi
d575256881
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59
-s ours am: 55356a71e8
-s ours am: 1f8eda570b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: I3d9df3346fdd96080a4e1257ce851bd3fda14b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:03:13 +00:00
Treehugger Robot
e476d48fc7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours am: ef7d5b407c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I753f9352d6ad732587c00e381c1635afc17fe5a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:02:58 +00:00
Bill Yi
bf2f91de1f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours am: 1686903bde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: Id681e91b0adcee84bdc6d755631e8d3c477d452c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:02:53 +00:00
Treehugger Robot
ae18b5b863
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours am: 2722d0887b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: Ic3b8f74e4bf2a1764986ad01278c6e6781d71abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:02:14 +00:00
Bill Yi
a2a2d5875b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours am: 66dc9d023f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: If30817a36df77ee0eda604c2ab9a3fb5389ec428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:02:10 +00:00
Bill Yi
d4c9006363
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21
-s ours am: f6ece5c0ab
-s ours am: b033f649d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: If2560a235e9e9289a13584b38b9a5fb1f3ae2d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:01:31 +00:00
Bill Yi
8f675f4147
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59
-s ours am: 55356a71e8
-s ours am: 009dc2dec8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: I1f08cdfe3f7f8ca3f8b0c2e60c8980711e476ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:01:23 +00:00
Bill Yi
e0b712d439
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21
-s ours am: f6ece5c0ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: I13c856de0a7413af609173dd78408e90059886a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:01:15 +00:00
Bill Yi
1f8eda570b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59
-s ours am: 55356a71e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: I36bf7c8f1b4c953fc8e862d4b04f4169d75c44ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:01:06 +00:00
Treehugger Robot
fa5b9dc846
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours am: 2722d0887b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I6c50d156f013c3413edec680100a86f8f05cc7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:22:42 +00:00
Bill Yi
f24204bb1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours am: 66dc9d023f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: Ibcdfb642ed89113614b4e9dbab206b126e0150b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:22:37 +00:00
Bill Yi
b033f649d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21
-s ours am: f6ece5c0ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: I299b182c33d2ae8648c41ef0a1ecb5267effa33c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:22:05 +00:00
Bill Yi
009dc2dec8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59
-s ours am: 55356a71e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: If2a42a755132b6181b6282c8e80a5feed8658e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:21:59 +00:00
Treehugger Robot
ef7d5b407c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I9c45339402f3217ba4b9efce60bceba8849cdc87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:18:49 +00:00
Bill Yi
1686903bde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: Ib7e14ca0a58437c78fddf82d7dbc8eaa23f5fbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:18:44 +00:00
Treehugger Robot
2722d0887b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I0f0603225c14df979d568805b6231a4b735b6471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:17:55 +00:00
Bill Yi
66dc9d023f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I379560c568a5fc02b2f163348a145ea8f20b61ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:17:52 +00:00
Bill Yi
f6ece5c0ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: Ifb7fd62b577b15673f9f4b3279fd524b0e855339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:16:23 +00:00
Bill Yi
55356a71e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278235
Change-Id: I79b9b76e701588b818b5a1e243d838e63d95ed2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:16:08 +00:00
Treehugger Robot
19935236b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-17 23:08:03 +00:00
Bill Yi
83fb70b58e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d69f19c92f
-s ours am: 77947a99f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842
Change-Id: I32a4d7337b720677f7d0ec2b7c87612e73e4709e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:35:45 +00:00
Bill Yi
2eddca314f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f32482d0d4
-s ours am: 4da3116de6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842
Change-Id: Ibed33d01e6977544d058b2ee72dfb5d85b5d250e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:35:38 +00:00
Bill Yi
ec3f5399ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1e7e184419
-s ours am: 63d6e269db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839
Change-Id: I150f99a623abd866599c553c5a39e6fee3f71fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:35:26 +00:00
Bill Yi
ed50db98a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0cb680936f
-s ours am: 02a083d573
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839
Change-Id: I46f65956a6835ee4559227b082b109f95a6bd039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:34:57 +00:00
Bill Yi
b3bb5acb87
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d4053e03a4
-s ours am: 639a014add
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280836
Change-Id: Ie7e1d105ac67f8d22d11ad983c59270a605af163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:34:38 +00:00
Bill Yi
48bdacaaf7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f83f62f608
-s ours am: b128113876
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280836
Change-Id: Ifc3827435ed25ceee62f4a834af8b204b2d084dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:34:22 +00:00
Bill Yi
2de88d0b1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d69f19c92f
-s ours am: 68f438bdb8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842
Change-Id: I387d68d785d14d0f27e18742518ee9205e346e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:33:19 +00:00
Bill Yi
95797d87c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f32482d0d4
-s ours am: 296000ea70
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280842
Change-Id: I9a951a8265c877b5f8284f8a7cbd78b670290441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:33:06 +00:00
Bill Yi
40c3425391
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1e7e184419
-s ours am: 632c6ef1f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839
Change-Id: Ifcdaf3b5197eb09b1e97ecd8bfbd7343748f5fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:32:59 +00:00
Bill Yi
082888caa1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0cb680936f
-s ours am: 81ffcfb260
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280839
Change-Id: I37f418ae4ca455743bd6c8842ac5635ddbdc51ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 22:32:34 +00:00