PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,577 Commits 1 Branch 0 Tags
d7e16c22f641b122131a1858e609f50ad3ffb12c
Commit Graph

110577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Milton Wu
23e9e62a23 [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ie15c1ba2581ec94323d365e55e623e355fc26069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:40:12 +00:00
Milton Wu
ed094b353b [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I911ef7db2860485823aa86c8c79e037b3db45389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 03:39:23 +00:00
TreeHugger Robot
eaabdee25c Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev 2022-09-28 03:05:56 +00:00
Arc Wang
9f04b02571 Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 am: 99cb9d91f1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: Ib9b0b40a546d3eecb11535e28841a668e0fd3931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 02:59:15 +00:00
Arc Wang
99cb9d91f1 Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: I2978b2a1b25c04d4cbac9022c3dc3ec651206bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 02:01:16 +00:00
TreeHugger Robot
4833fc2cd7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 995dbc4f45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib14252b3a16901a75b0b450e8da172b1a8dc09d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 01:42:43 +00:00
Bill Yi
2ab2b35cbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c920993671 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdb0ece83ecade6e085421d09de8860e7f3e525b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 01:42:17 +00:00
Arc Wang
6626e50dd8 Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" 2022-09-28 01:22:51 +00:00
TreeHugger Robot
995dbc4f45 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-28 01:04:10 +00:00
Android Build Coastguard Worker
ccebb8b22e Snap for 9111705 from f1807d897b to tm-qpr1-release 
Change-Id: I86d1ea4b5b3e878682ec107a1c4d6933397e1e1a
 2022-09-27 23:25:46 +00:00
Bill Yi
bdb3c55f7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours am: 14b86ebfce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5e433cf9892156e4c19130e60310343ee43f80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:13:19 +00:00
Bill Yi
f22176a82d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours am: b038fdb3b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc8a6e7168b2753aa9f838e984b1cf29fdd0bea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:13:10 +00:00
Bill Yi
89136d4bdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours am: e744ffb618 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25558231205e038baee1005baaddffbed33251e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:12:52 +00:00
Bill Yi
7ba3cd7e3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours am: e79f03ac12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I904fd061983fa03c751cbaa93da9940798c470fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:51:06 +00:00
Bill Yi
6aebd0ce26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours am: d761c73acc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I87c85aa17db8f82e7959aa2006cc6aa0ce608d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:50:55 +00:00
Bill Yi
0c4ad6f1f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours am: 607d34f0ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I879f7100ec442d915a37d22287f7c2b074876bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:50:41 +00:00
Bill Yi
96fc8ede52 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 0e38635a4d -s ours am: e910d1943b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I930ba0a6c57e4619d205ee9a238059bfc4576f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:26 +00:00
Bill Yi
e79f03ac12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14053b570db226c0fa08fa56c76d8b3470aaa493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:15 +00:00
Bill Yi
14b86ebfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: e0c74c9f4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia006c877cbd06a9061467ea62905a537fea20535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:14 +00:00
Bill Yi
6c427100ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: d267bd8655 -s ours am: 772476e65c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a285afd827ed414ec46e8610e11c51e252ba2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:13 +00:00
Bill Yi
b038fdb3b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9fefe865a9e53a599089211f2471e84861a1d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:05 +00:00
Bill Yi
d761c73acc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: ff2b23ea95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0b0636ca76fa53ce38ae420649762ae595a9817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:04 +00:00
Bill Yi
ea0084439d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 0928d5bbaf -s ours am: 3bebde58b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e598355f3cd878d3b748b2175c7e85014233d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:31:02 +00:00
Bill Yi
e744ffb618 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d5074d89fe27ab8fef33632a8702f445d67c6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:30:49 +00:00
Bill Yi
607d34f0ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: efa32dc352 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e3283ba4d39bd8aaae31c0e5b7729b0cc4c81e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:30:49 +00:00
Bill Yi
e910d1943b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 0e38635a4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24710e07473821fc74eb2d370ac26176de7df766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:18:56 +00:00
Bill Yi
772476e65c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: d267bd8655 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98390769e2d8ddb0719c12572ff8a5d259d35813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:18:46 +00:00
Bill Yi
3bebde58b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 0928d5bbaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41745572c2e4d6e629f639c930d43f524c79ecfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:18:30 +00:00
Bill Yi
0e38635a4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfedb5270e175e11962cea5feac0186c754eaa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:44 +00:00
Bill Yi
e0c74c9f4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia18bb4a94e58e722ee81f58210eef4c306a72bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:41 +00:00
Bill Yi
d267bd8655 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfb4d78c4245679bc0c62b696e23263a9183d353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:34 +00:00
Bill Yi
ff2b23ea95 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffe1907092d830d4395f8292069529c448ec88ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:30 +00:00
Bill Yi
0928d5bbaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd385a535680b4674adc83a4650cc86f8be59192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:18 +00:00
Bill Yi
efa32dc352 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c2c7fa020fb3bb13fd41213e92fcb8b4d8683b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:55:15 +00:00
Bill Yi
dbe25724d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-09-27 17:11:14 +00:00
Bill Yi
c920993671 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4efd7d3316b1782c9e502c75284a753fc9d692d
 2022-09-27 10:00:16 -07:00
Ats Jenk
6d69676059 Merge "Add support to hide developer tile based on a flag" into tm-qpr-dev am: f1807d897b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20031235

Change-Id: I9715ad0b620212e08d4d2f744d17c12da26b26e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 16:19:51 +00:00
Ats Jenk
f1807d897b Merge "Add support to hide developer tile based on a flag" into tm-qpr-dev 2022-09-27 15:52:37 +00:00
Weng Su
6629b12a08 Restrict Wi-Fi configuration if settings UI is restricted 
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).

Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: Id82498f41765f955e01bb311bb221d26f9574f31
Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
(cherry picked from commit aaa65fc6f0)
 2022-09-27 14:31:09 +00:00
SongFerngWang
51cabc5553 Add the way for hiding the "contact sharing" on the pairing dialog 
There is the way to hide the "contact sharing" at the "device details"
page, but it did not be implemented on the pairing dialog. Add this way
on pairing dialog.

Bug: 246668278
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDialogTest

Change-Id: I472acb80e70fe5d2a59cb9eed95fcbccfa417fa5
 2022-09-27 16:06:49 +08:00
Android Build Coastguard Worker
55e4a7d20c Snap for 9107440 from 9ef4f7bf83 to tm-qpr1-release 
Change-Id: I257f3b1a60c5d6af8b1ff4ca4d06ee5e23636496
 2022-09-26 23:29:48 +00:00
ot904699
aa76620073 Fix USB OTG hot plug out nndexOutOfBoundsException 
Open Settings, then open Storage , plug in USB OTG with Disk, select Disk, open Files, play a video, press the back key, hot plug out USB OTG, the IndexOutOfBoundsException will happen

The root cause is when received the onVolumeStateChanged in StorageEventListener in StorageDashboardFragment, the volumeInfo
status is VolumeInfo.STATE_UNMOUNTED or VolumeInfo.STATE_EJECTING, mSelectedStorageEntry set to changedStorageEntry, cause the fail.

This is a fix for CL 225095144 bug.

Bug: 247737688
Test: Manual

Change-Id: I9535c49d65c42a8dfa8ccf4e271ae973d944d4b9
 2022-09-26 08:15:48 +00:00
Automerger Merge Worker
8b698d46a3 Merge changes from topic "am-44884482f39c4e5bb8e97e19df49f3d8" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 9ef4f7bf83 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: 49e8ae680f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: db81d7d5ab -s ours
 2022-09-26 06:07:09 +00:00
TreeHugger Robot
211ffb5d1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 6b68056ab6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I969e49c03907bfa3ee03dc2e0717a01dc0440f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:39 +00:00
TreeHugger Robot
bdb77f2c7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 9ef4f7bf83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf02d341caf3a6c50cbfd12a73ef11dc512f2089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:33 +00:00
Bill Yi
e5efbb0e5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: c802b51978 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c876af69d65c5e9be7e72684a5fa2c71c6975cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:26 +00:00
Bill Yi
637f8bdd5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: 49e8ae680f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09117dde481df49ff57a2da477d2e9fa6a3d33a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:22 +00:00
Bill Yi
359712a426 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: 44c4eadbd3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba0ff644ef6e947c69e0270ecdd78511e970bff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:15 +00:00
Bill Yi
4220e27e3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: db81d7d5ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f6a1b7a1fea9fab71a46f0d8163dcbc909724ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:06 +00:00
TreeHugger Robot
6b68056ab6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8d350fd3268d547a91f443b245742a77b3aa594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:43:09 +00:00