Commit Graph

127851 Commits

Author SHA1 Message Date
SongFerng Wang
376ca216ad Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I768f9c3b6d1ee556bbd2238ea1f3b72ae008bac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 07:44:15 +00:00
SongFerng Wang
2319563b00 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I7745d09826da393c5d3c2377f37ab2761d313dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 07:40:02 +00:00
SongFerng Wang
c487d5a10c Merge "Update the wording for LE Audio" into udc-dev 2023-05-11 07:11:11 +00:00
TreeHugger Robot
a40d45dec0 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337 am: 134b71f95f -s ours
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: I500743115266907cd963c0ad4aaa31132d6613a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 06:22:10 +00:00
Tom Hsu
571a7f1d37 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c am: b40c753898
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: Ie66861304e65fec17aa48c59c11052c0cafc069a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 06:21:30 +00:00
Milton Wu
d126303343 Enable presubmit biometrics unit tests
Enable biometrics/biometrics2/password unit tests

Bug: 281627891
Test: atest :presubmit in Settings folder
Change-Id: I2587b50b75a161c7b19f1e3430e41b98cfe6cf63
Merged-In: I2587b50b75a161c7b19f1e3430e41b98cfe6cf63
(cherry picked from commit a90536b632)
2023-05-11 06:07:08 +00:00
Bill Yi
31de22b7e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: df7171b29c -s ours am: 033e4f621c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a886fac9ee49e18872c7fcbef185e86134d4f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 06:02:33 +00:00
TreeHugger Robot
949e8e505f [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 758c01fbb8 -s ours am: cfa6458241 -s ours
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: Iecf7b12e1bb4aabfd9f95efd1928b42ef0a827e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:57:46 +00:00
Tom Hsu
01594df3c5 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 07db6514d3 am: b679aff5a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I6d35d0d72ad481ed06153e0d285143ea731954f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:56:49 +00:00
TreeHugger Robot
d3d03b6024 Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337 am: 00cc06ab7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: Ie1c70892210b053feea648835b6a4e66e00fa229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:56:00 +00:00
Tom Hsu
c01bb6d556 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c am: 32dd2dc83c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I30b6f5bcab99c7eaf0a428fd2aa5d5b6ccfaaa92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:54:27 +00:00
Bill Yi
3ad426e075 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 2b214a4e1a -s ours am: fe4f51b4ab -s ours am: 43bfeadf44 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54bb0f38b617aa05b8d87e97b8374030ed19cb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:43:43 +00:00
Bill Yi
668807e767 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: c5708ff051 -s ours am: d0e755b576 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib77daf65484b0c60db6a6f6757d485f02373ebfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:39:56 +00:00
Angela Wang
bec64bf5cf Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: f4b7715453 am: 750a6907ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: Ia752ea39efedb391e0b81de689b11c1715ee506b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:39:02 +00:00
Angela Wang
d7d238136a Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: 378e9f073d am: cc52fa2c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I1f8caec90bff5eebac410535cd5a0990dd710a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:38:53 +00:00
Angela Wang
de783f1b52 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: 16fc56f72c am: c4ff1e822f am: f9561db866
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I9459abdfd28ce2ed85e39500deb10eaf69c16e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:38:39 +00:00
TreeHugger Robot
cfa6458241 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 758c01fbb8 -s ours
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: I4f749c52da2f4370fe6771caa342024a5ced4603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:35:37 +00:00
TreeHugger Robot
134b71f95f Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: I6ed8ede29cd4bc43039081864a020b36b1e9117c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:35:31 +00:00
Tom Hsu
b679aff5a0 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 07db6514d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I18f2b39a05daa7d95ba41e8d5d1386daa86e9a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:34:34 +00:00
Tom Hsu
b40c753898 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: Idf88f139230f8b6cbaa3049e5d28a7febfa52cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:34:25 +00:00
TreeHugger Robot
00cc06ab7a Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: Iec6d97042a0fc3b6d68a194ff0eff37f3243c0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:33:47 +00:00
TreeHugger Robot
7d14d18af0 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 3d886d929e -s ours
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 9272c0e3c8 is already in history

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

Change-Id: I5b5fcd65f51a2195b1ae91c1f746473615a1143f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:33:11 +00:00
Tom Hsu
32dd2dc83c Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I5fed4eb62ef9d72b24e0909126c3592eab949959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:32:46 +00:00
Tom Hsu
27a0488790 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 9d3ac48f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: If2e552263d63342ec69eb3b93ccf357c60bcf59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:32:17 +00:00
TreeHugger Robot
758c01fbb8 Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: I91aaaf25b6b8e8d865b4104eac643bb97bf52a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:13:36 +00:00
Tom Hsu
07db6514d3 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I75594ae645fa1556b08f639f4f3c014d7038103b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:13:06 +00:00
TreeHugger Robot
728b1b8337 Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: I9e96a83571c105b8858dc4bdc4f578dc6720f652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:12:49 +00:00
TreeHugger Robot
3d886d929e Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: I0e960f28ea3818f8d9dc1200bb4087ddf668846b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:12:41 +00:00
Tom Hsu
4d3264553c Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: Ibff6a407d7211597f6f8cf97c4ddf7403f11330c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:12:12 +00:00
Tom Hsu
9d3ac48f44 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I640022d4161fd17a8a01770a6a031b6551d8de76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:12:09 +00:00
TreeHugger Robot
1742524dd3 Merge "Show disable dialog box when none is selected" into udc-dev 2023-05-11 05:02:34 +00:00
Bill Yi
033e4f621c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: df7171b29c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1a10035719b7c7cc240a34172f2be3f4590c771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:54:25 +00:00
Bill Yi
43bfeadf44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 2b214a4e1a -s ours am: fe4f51b4ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib38519b0678f00bffeb4ebb39dc9cd8da76e1ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:50:03 +00:00
Bill Yi
d0e755b576 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: c5708ff051 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84f301fb63dea19c6b9ed0e1d1de8bc471e0c19d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:49:19 +00:00
SongFerngWang
f4c5c8ef5e Update the wording for LE Audio
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass

Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
2023-05-11 12:30:59 +08:00
Tom Hsu
5576947555 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev 2023-05-11 04:30:19 +00:00
TreeHugger Robot
6217cc2c18 Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b am: d025a6f35d am: c7c5ed67cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132

Change-Id: Id8c4a73bd6ef37bcfee05a87274e49953bcd8e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:24:11 +00:00
Bill Yi
fa0b2789df [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492 am: 77e2066906 -s ours am: 2292bd9446 -s ours am: e6fac1e361 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id488990c1cdfc2238528c3cacf7b3cdb35fd8f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:24:04 +00:00
Bill Yi
fe4f51b4ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 2b214a4e1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icda1661a7d64321824675959a8e84ec9d675442f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:12:34 +00:00
Bill Yi
df7171b29c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice35642bab935922131380e3942f60112f9bae6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:10:43 +00:00
Bill Yi
c5708ff051 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e3d26fc1779000ee21dbb21f5c3d5d507224a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:08:21 +00:00
Bill Yi
bc489c43fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: fb47fec995 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id430738bcb36e1bb52ad73827a9ddd2a6f73a25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 04:07:24 +00:00
Automerger Merge Worker
03aaab54bf Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp am: 49f3ae7345
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672

Change-Id: I8c19d4defb5455b005aacc55d85d7a866ea368e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:56:25 +00:00
Treehugger Robot
addb72e027 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours am: 00769fdce2 -s ours am: 980c2a5f24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c4b5090aa2066669c75e2250cc09d6b7f2b40a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:56:07 +00:00
Treehugger Robot
78ada9d395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: d8e8583c71 -s ours am: 560129e42f -s ours am: c5fbb4e3ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc06bff0a15782df5298fbdee005b1c3df67a660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:53:30 +00:00
Bill Yi
ba4305b9ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: c1d77f492b -s ours am: c305ac507c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic5d4de4e4f1eb223c5f5305f282013e47cab3fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:53:28 +00:00
Treehugger Robot
5828aa726c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 6ace5ad965 -s ours am: 275f119ae1 -s ours am: 6dd581d8c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6d37a2a7ae58dda73277bd782dfb9ee66cf6a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:53:26 +00:00
Bill Yi
4c1aafc850 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: 6cc5e5c226 -s ours am: ba6a55423d -s ours am: 6f45f4f389 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a6dac1ba42dff9421c5b72c894631e7121f748a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:53:05 +00:00
Treehugger Robot
65bf19227f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 76d0d8c12b -s ours am: 8e1636b67d -s ours am: 6cdf599ce2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb817e9b9f1e5cbde9643f891cf624ed084ccbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:52:46 +00:00
Bill Yi
58702d653b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: e578c1477f -s ours am: a8e65872e0 -s ours am: 1f75b586b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67946e21ccb7f6ed115950c115734f8d04008805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:52:28 +00:00