Commit Graph

124527 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Angela Wang
750a6907ca Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: f4b7715453
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I9ab0ccf97d8f7fd56edf208fcfb6488cb65bbbbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:52:27 +00:00
Wesley Wang
cf1190c7cb Update battery health state intent (2/3)
- Update the extra from overheated to longlife

Bug: 278192441
Test: make SettingsRoboTests

Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8
2023-05-11 11:27:16 +08:00
Bill Yi
541d74eb4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -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: Id45461b6303f6d7f3da8e2b6c2c7c0e34447c74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:26:10 +00:00
Angela Wang
cc52fa2c4a Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: 378e9f073d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

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

Change-Id: I2522610e2c24d01fbec5909d14852abe94873c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:22:51 +00:00
Bill Yi
2b214a4e1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -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: I9aff000835f3d1642e505e8543adbe7d059f359f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:22:08 +00:00
Angela Wang
f4b7715453 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I343a2e4d7ee4c765b4ee75e6f5a08e65a341a3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:04:24 +00:00
TreeHugger Robot
c7c5ed67cb Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b am: d025a6f35d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132

Change-Id: I19614cbdb66f46d18a9c130b446cb92a2dbbcdfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:01:09 +00:00
Bill Yi
e6fac1e361 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492 am: 77e2066906 -s ours am: 2292bd9446 -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: Iff360850e825c6aa74e6f6d4ce9532d0ecebdb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:01:07 +00:00
Angela Wang
378e9f073d Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I8b271bdd8529fc596e5bf30132d0a1886e189fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:00:56 +00:00
ykhung
8f56114489 Record app optimization mode backup into BatteryHistoricalLog
App optimization mode format:
https://screenshot.googleplex.com/di9DDzBfYf7ihfV

App optimization mode backup format:
https://screenshot.googleplex.com/GkVW5HrgGvmv5yh

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I60a9a76a8ffc89d625ee3f77c138a19181c81c38
2023-05-11 10:48:47 +08:00
Angela Wang
c4ff1e822f Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: 16fc56f72c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I6088b5e1c4e5bb7db783ecca348e490c87b0a1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:44:28 +00:00
TreeHugger Robot
d025a6f35d Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132

Change-Id: I9af5fc172e4427f80ab9b51d7e6b3aeee1615822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:42:42 +00:00
Bill Yi
2292bd9446 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492 am: 77e2066906 -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: I0b5c2fc3399dc4367f9871cad439da9b0138c3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:42:37 +00:00
Bill Yi
c8c199020a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -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: Id8b9494bf8edd0e1ea401b95e3bdfc558c58eb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:40:17 +00:00
Becca Hughes
8e9119f5ab Show disable dialog box when none is selected
Also remove from CMPP since that will be
hidden.

Test: ondevice
Bug: 281147573
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-11 02:28:54 +00:00
Angela Wang
e9106f35ce Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

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

Change-Id: I580326606ec0e281f42e57dd464be5265e9bf948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:15:50 +00:00
TreeHugger Robot
d803091a4b Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5
  Import translations. DO NOT MERGE ANYWHERE
2023-05-11 02:01:07 +00:00
Angela Wang
22d3116188 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev 2023-05-11 01:41:47 +00:00
Automerger Merge Worker
49f3ae7345 Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours am: 00769fdce2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 265171b600 -s ours am: f54aaa1106 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 2dc66817ed -s ours am: af736477bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: aff5a4b154 -s ours am: 35727e14e8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 27ef5fc280 -s ours am: f2a8b2e09a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0781830995 -s ours am: 4e4c2e91c3 -s ours
2023-05-10 23:32:27 +00:00
Treehugger Robot
980c2a5f24 [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 skip reason: subject contains skip directive

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

Change-Id: I02c51c9ec66836adbcd276a462403f4ccf327039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:32:05 +00:00
Bill Yi
a3656dc9b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 265171b600 -s ours am: f54aaa1106 -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: I2c48950146fcc247cec313fd5d2bcc668f8d8e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:32:02 +00:00
Treehugger Robot
59e7124304 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 2dc66817ed -s ours am: af736477bb -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: I03fb4e3e5ea46e7bb1e162a87793e0df7bddc6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:31:59 +00:00
Bill Yi
8c210f44e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: aff5a4b154 -s ours am: 35727e14e8 -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: I9ee4e2915206cb5fc4302d773dd4da7d014fff2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:31:40 +00:00
Treehugger Robot
c5fbb4e3ea [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 skip reason: subject contains skip directive

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

Change-Id: Ia473dbd2244c68d1f4217009298b6abf3ed5e9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:31:31 +00:00
Bill Yi
c305ac507c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: c1d77f492b -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: Ie9082704296ce99f1632309394e8cdea630d9549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:31:29 +00:00
Treehugger Robot
6dd581d8c1 [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 skip reason: subject contains skip directive

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

Change-Id: I64026a6c5f583c41bd4b4c2a21553847b272a343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:31:26 +00:00
Treehugger Robot
ecc262f5fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 27ef5fc280 -s ours am: f2a8b2e09a -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: Ieecf24774029493228b32345ce478299de1d224b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:31:20 +00:00