PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,935 Commits 1 Branch 0 Tags
14f5981b8e9e0dcecc7a1ad8bc2418d4fd03438d
Commit Graph

130935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
14f5981b8e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: a9dd669426 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0010bab6207ad850f66135451fdf48d2ba133681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:17:26 +00:00
Bill Yi
ae4df0db50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1c7d5a2a6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2251076fbc10c10d116c5cf6bb72d4ae0ea80e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:17:20 +00:00
Bill Yi
4933798e04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: b14edb9c5d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c64e1823b68a5cb59bc4d6f4908c22bf6edb347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:17:11 +00:00
Bill Yi
a9dd669426 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b716efcee23ef5b13c685e9e4ac2ac9e0a7509d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:36:05 +00:00
Bill Yi
1c7d5a2a6c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69966b3b7a359c89f5e5cf0252ade5fb4c004b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:35:59 +00:00
Bill Yi
b14edb9c5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If33f1daa16456ec7ebb8f1b544ec2e949c6114e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:35:47 +00:00
Evan Chen
7f12ecfc00 Merge "Make sure work profile app cant enable notification listener services" 2023-06-21 20:24:09 +00:00
Bill Yi
bfde831c44 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-21 19:19:29 +00:00
Bill Yi
6072ca10ec Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
 2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
 2023-06-21 07:15:19 -07:00
Treehugger Robot
84d3f2df74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3a3d7e41a3 -s ours am: fa2f6edc55 -s ours am: 147e3bf0c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a3b9021f5ea28f388df52f8bb2184e264fc164e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:12:26 +00:00
Bill Yi
8928e4b925 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: ed188e243f -s ours am: 450076d57b -s ours am: 78c6b3a910 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76c02ad01288fbe7a92e449ae22750e6cc0eb67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:12:12 +00:00
Bill Yi
95d14f7098 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 5499c23607 -s ours am: d35f04d453 -s ours am: f25b5dca5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib341139b6c29c93eb3e835ced8dab964d928a594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:11:58 +00:00
Automerger Merge Worker
d9d9c49259 Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: 8fd358b746 am: 65ed33547e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633

Change-Id: I854f3b59e90380ebacdb9b39b79d41f63151cfcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:08:22 +00:00
Treehugger Robot
99830fd9c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3cc206bb14 -s ours am: 36cab9526d -s ours am: 5303b7ad0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2be7238bc1f5720a81a0940f644b7515a428c443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:08:07 +00:00
Treehugger Robot
35c8688276 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3a3d7e41a3 -s ours am: ca92c010e4 -s ours am: 73fca2ff71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94b3071e64a0d34251b2dd2a6d6916513928bfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:04:40 +00:00
Bill Yi
982a559c72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: ed188e243f -s ours am: 4ea827c82c -s ours am: 6aa069ef44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a6e58df6f4b3895358a0dd31edc1ebe2d55f892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:04:35 +00:00
Bill Yi
a41e0578bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 5499c23607 -s ours am: 941771948f -s ours am: dd845023d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4912860df548dc51cb083e0a24f45837210c3e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 10:04:06 +00:00
TreeHugger Robot
41bcba352f Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: d6ae6f8655 am: 4b20b38673 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I5f154df6d8a606b07db6ea4c7c86b2f51736aeed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:05:29 +00:00
TreeHugger Robot
cc6e6ef83b Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: 87f7101866 am: 6df1a755e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I97764666fcf0f9547333133ae906939c6fb00df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:05:18 +00:00
Rambo Wang
b0ea4e9ed1 [automerger skipped] Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev am: de5c8613ba am: 330a6b2259 -s ours 
am skip reason: Merged-In I0b88ef089097930b62dcb1cb7d6fe9990356ab5d with SHA-1 f7b8d687bf is already in history

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

Change-Id: I937486d64f4fd8a72f826448fad4011284a4c656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:05:09 +00:00
Candice Lo
958e154598 Merge changes I75d810e4,I50111f0c into udc-qpr-dev am: 290d241b1b am: 380deaaa3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23738691

Change-Id: Ia01815e7558b7f31eb05c7bd1fa12c7a7a930cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:04:56 +00:00
Julia Tuttle
a9d8ce0e09 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 87d6681e8b am: 41e2eb2261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ic63f22811866a6a1b613e6ad44264f9bd5a11747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:04:44 +00:00
Julia Tuttle
940bf6b7ab Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: ee0d1171aa am: f5bc25cdf3 am: d997ade447 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ie6e9374ddadb2f316a989783e970eac2d9bb6259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:04:34 +00:00
Julia Tuttle
2b11df8aa0 Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 205135ffa4 am: 20ac28dfa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ia0c8ec0fc5eaa7fa1926bb79778e50ea7a0a02d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:04:24 +00:00
Treehugger Robot
74e2f4e890 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 am: 975e782dd4 am: a58d63cfc7 am: 01c4dd3eb8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: Ib43b827e3aaa9b8786b053bc4b0838c0d9cb0395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:04:15 +00:00
YK Hung
41d08dd065 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb am: ca2d241193 am: 5c75161739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Ib96e15719112288b918d44c86f3ab7d87941abb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:04:00 +00:00
YK Hung
f6efd3efb5 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb am: d97a38be76 am: 207b990ff4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I4cf40fa216b12ccbdc2b6a5ebda5d4a1d2740ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:03:47 +00:00
Automerger Merge Worker
87834df2c5 Merge "Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd am: c2e7b61ee9 am: 7f9afcf553" 2023-06-21 08:03:40 +00:00
TreeHugger Robot
dfe6fac149 Merge "[BiometricsV2] Refactor EnrollingSfpsFragment" 2023-06-21 08:03:37 +00:00
YK Hung
3cfdcb67b2 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd am: c2e7b61ee9 am: 7f9afcf553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: I2db2619d75e3e22c31192bd446132237a04381e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 08:03:32 +00:00
Treehugger Robot
147e3bf0c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3a3d7e41a3 -s ours am: fa2f6edc55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1633063af39969d5f6941f60478d75bc677d8e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:40:24 +00:00
TreeHugger Robot
3b03be9fe3 Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev am: fcd80ade3b am: 3924138fb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729063

Change-Id: I4e50da4138c440758314c169699439cf8f9bad1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:40:16 +00:00
Bill Yi
78c6b3a910 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: ed188e243f -s ours am: 450076d57b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a5c541938ead693895ac15c1d0bc576bcae8be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:40:11 +00:00
Bill Yi
f25b5dca5a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 5499c23607 -s ours am: d35f04d453 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0971886094db879ae18561c6da61d07add9702be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:39:56 +00:00
Chaohui Wang
6ceab64548 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 am: 6bceb29408 am: c1f06b5e28 am: 8429e8cc79 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I78d51e756ebdb33200d349d92b52e38c87ddd0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:39:45 +00:00
Chaohui Wang
e67ab68772 [LE Broadcast] Fix crash when scan QR code am: c91d017080 am: 542ef9e5b2 am: 4828cfe003 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065

Change-Id: Ifd367d4d1e90d1ccbd401178f076aafac759961b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:39:32 +00:00
Chaohui Wang
2793cb49a2 [LE Broadcast] Fix crash when scan QR code am: c91d017080 am: fd264a7696 am: d7147fd952 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729065

Change-Id: Ia9075bfbbb43433db895af2de6b8eff0c56a6a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:39:22 +00:00
Chaohui Wang
fd4bfd4c0e [lint] Fix Wrong Resource Type am: 7aaceaa782 am: 68159be3ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154

Change-Id: I3ce015dfd694e6c7cbdb247a2026e845ea3eb717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:39:11 +00:00
Treehugger Robot
d2db098cb5 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: 44fddb456e am: 7d837a745a am: cfc7387cc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: If80ca6404ab62aac09d81ede4458d2838374aac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:38:59 +00:00
TreeHugger Robot
6666092fa6 Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: 7d941f3e34 am: 12255bf880 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: I12837d52779064aa3b739c7ce21061dc4d999a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:38:48 +00:00
Treehugger Robot
87af2c6de3 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c am: d9c0cf79e8 am: ea9ab2482c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: Ia8a674a7bd95108d4d06fd68f177133c186bca55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:38:38 +00:00
Matías Hernández
0a9d26e26e [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 95a2f32e7d -s ours am: 097f9ce7b1 -s ours am: 5b5988ce81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I233d9aeec1e339833b05f42c621186350cd70adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:38:27 +00:00
Matías Hernández
394558f725 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 4226b5bb24 -s ours am: 7b36addbb2 -s ours am: 4ebe206d3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74b5cf1c62c8b7fed30e634ecdf15ef96bf370c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:38:16 +00:00
Matías Hernández
4c793b7b5c Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce am: 0bdda899d3 am: 6ca31b9630 am: e8950434fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I7d9c6c9ffc84255bf9da6cd9a1c19f171300acad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:38:03 +00:00
Matías Hernández
877ecd79d3 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: e8cfc9cb3d am: f5355dbb51 am: dc19c15d64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I3b431b964776945cc6d953c7c98b5a35c0434970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:37:51 +00:00
Automerger Merge Worker
65ed33547e Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: 8fd358b746 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633

Change-Id: I07e681c31a9b5888d0a8c51ec53c5de20ed4c131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:16:49 +00:00
Treehugger Robot
5303b7ad0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3cc206bb14 -s ours am: 36cab9526d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98bdfb7ccae6445c78747449ddd7f28660e33f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:16:29 +00:00
Treehugger Robot
73fca2ff71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3a3d7e41a3 -s ours am: ca92c010e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie414b62bb1ffb7dcb7e962e5c174a5eaf129b0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:13:15 +00:00
Bill Yi
6aa069ef44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: ed188e243f -s ours am: 4ea827c82c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia49273dcbfd0537c40128fdcb3655eb9147a1940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:13:04 +00:00