PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,519 Commits 1 Branch 0 Tags
ac92edd8cf7d249a4995057c754e4a5715281a08
Commit Graph

120519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Wang
ac92edd8cf Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f am: 35ec32bb18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: Ic703f7095014c9c34fb8395d7c2cffc88c401c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:53:34 +00:00
Vincent Wang
35ec32bb18 Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I0017be373d3a5003913fd9d9fa86c2c8ced16c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:09 +00:00
Vincent Wang
731ded4f9a Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I5afdcebedeff7b17cbcf3499d2b81c09502eedac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:01 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
TreeHugger Robot
60c8c5e985 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e am: 5d32369ec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I74832d8b7d850c582e25a5d881bc8c78718bc418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 11:26:06 +00:00
Tom Hsu
4c30d29dd5 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 am: ad6359cfbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4239916ef65de0a83712890ec8092c49971d1183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 11:24:32 +00:00
TreeHugger Robot
58333856cd Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: Idc4b057032a4efcbeb48fce1767d06a4e163b0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:50:10 +00:00
TreeHugger Robot
5d32369ec8 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I090cef5138a424af861d3e2a306c8f8657c421d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:49:58 +00:00
Tom Hsu
a74a9bf6c2 Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: I4a1b9290a8729271ac08e4283432af32ec524931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:48:57 +00:00
Tom Hsu
ad6359cfbb Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: Iea1de3d7bfe3db293deed904c1459da57478d6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:48:26 +00:00
TreeHugger Robot
fa57dd3f2e Merge "[Settings] Re-enable previous work on data saver" into udc-dev 2023-02-24 10:15:32 +00:00
Tom Hsu
7e2ea92559 Merge "Switch off Calendar UI fo regional preferences" into udc-dev 2023-02-24 09:47:01 +00:00
Vincent Wang
882b49c8fb Refactor FingerprintEnrollEnrolling to fragment 
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
 2023-02-24 08:43:17 +00:00
Charles Chen
638f2309fe [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours am: 84c1cbe2cd -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Ia099fe16988487f3c02a45ae3864363ec920dd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:12:21 +00:00
TreeHugger Robot
6da120c7b5 Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092 am: 8748b299bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: I94a8257092fbb7dbae7daeeb9b4b5a65eb4833f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:10:21 +00:00
TreeHugger Robot
25fabae5ac Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4 am: 76baf341d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: I4a7145554f6167828cda024ba7b56cd7528b563d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:07:43 +00:00
Daniel Huang
871122ca24 Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863 am: 3b00f28b6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: I4bfdaafed08ab563aa8e49574e47cd27f6647d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:03:35 +00:00
Zaiyue Xue
a000f98438 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59 am: d99ae387d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I37dd3f4cbc493c169d0f81b96383f4f12cb0115d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:54:31 +00:00
Avinash Vadlamudi
a491337497 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee am: d4e541f101 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: Id69e9e8e86dfcfd5945e9f426233788b64fe8de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:54:13 +00:00
Bonian Chen
fb9f85ec65 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94 am: 7bfa22df7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I4a13552fe5d9dfb7d06b0e5caad3b06359d39f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:49:24 +00:00
Charles Chen
84c1cbe2cd [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: I6c496790a26b516bf003aefc30e9bb52ff816727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:38:36 +00:00
TreeHugger Robot
8748b299bb Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: Ied1b19f97d2c170c21c00f4425b54bbb494eb6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:33:20 +00:00
TreeHugger Robot
76baf341d2 Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: Ia72afbbe0cdc696dc42e84e199374bf2ef993cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:30:34 +00:00
Daniel Huang
3b00f28b6f Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: Iad85e0c130b774e9df08aa75df5ed08467280d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:14:40 +00:00
Zaiyue Xue
d99ae387d8 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I9f64cc6e3a11f76ee920b557ad5ec6d77dc5f73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:13:30 +00:00
Avinash Vadlamudi
d4e541f101 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: Ic83e6680667c7231d964a0beca11a7382aa89fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:06:00 +00:00
Bonian Chen
7bfa22df7b Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I07f82db18158882064867dd628e0227c2e30ef3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:03:43 +00:00
Bonian Chen
2c92075e93 Merge "[Settings] EID should be read out as phone number" into udc-dev am: 07d60877b6 am: a721bf0895 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546836

Change-Id: I7820069bb49d573f2b415b2e2e2f1116b69cd1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 06:57:25 +00:00
Bonian Chen
c9cca5940b [Settings] Re-enable previous work on data saver 
Previous work on data saver performance got disabled, this is a change to re-enable it.

Bug: 249502488
Test: build pass

Change-Id: I7264b1e8c21a789db358e0aae70a2cf0ce09ebba
(cherry picked from commit 2115d0e495)
 2023-02-24 06:27:18 +00:00
Bonian Chen
a721bf0895 Merge "[Settings] EID should be read out as phone number" into udc-dev am: 07d60877b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546836

Change-Id: Iadf05dfe61cf4949c3fdc98c9836841fd56ff67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 06:17:21 +00:00
tom hsu
22dff773fa Switch off Calendar UI fo regional preferences 
- Due to unsupported calendar type in java lib, it may happen
   unexpected exception. Hence switch off this function till we find a
   better way to improve.

Bug: b/270650444
Test: Manual test.
Change-Id: If380dbe5d98b915f3e288eb668df573ef2971ae2
 2023-02-24 14:03:45 +08:00
Charles Chen
7b56fc72c6 [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: I378791a935de14381392f3053157cf8f635cd782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 03:47:33 +00:00
TreeHugger Robot
673228592e Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: I4e18746978e31b21bd227309f97aa861662e3d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 03:47:16 +00:00
Charles Chen
4aaf6c191b [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Ie31e3ef8ec302bb85de93b937546141e5ea41b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 03:24:08 +00:00
TreeHugger Robot
802bff9092 Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev 2023-02-24 03:10:42 +00:00
Charles Chen
dce4259653 [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Icdf326ddcf7fa2edc60f9e7b84c581d8a626e0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 02:44:21 +00:00
Anvesh Renikindi
511fc77c6e [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours am: 52f50db889 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Ie1aedddd1da0a5121b16c36bb90c0141759f7348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 00:59:11 +00:00
Anvesh Renikindi
2e53abf492 [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours am: 445d0468a7 -s ours am: 91c11a510e -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: Ie7058f3bcebe01788252b20595384e1193c29e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 00:59:06 +00:00
Jiaming Liu
f97ce8ce5e [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -s ours am: e220a48650 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I3c36e6fe17f22cc7ca7474a4d7931f3f13c536ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 00:58:56 +00:00
William Escande
dfe474b23c [automerger skipped] Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817 am: 1d6757782c -s ours 
am skip reason: Merged-In Ie6a6b27247896e2a9a410197135e44a22ab1428c with SHA-1 c0a7e8f8f0 is already in history

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

Change-Id: I7c450179fe4b7403bf7486d7a13b7f10cf70d629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:54:08 +00:00
Anvesh Renikindi
52f50db889 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: I7020d2db7917247f08344ccdee09b5799931f0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:33:36 +00:00
Anvesh Renikindi
91c11a510e [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours am: 445d0468a7 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I4eff1cd9accd1cf73f5835d2b31ce7bf4a34958c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:33:33 +00:00
Jiaming Liu
e220a48650 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I13481950639eef78839601e8171484036437fed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:33:30 +00:00
TreeHugger Robot
5443c95ea8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d7b8a73da9 -s ours am: 26a297b550 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie40a7acf1146be34444deb35748113c5452020c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:00:05 +00:00
Bill Yi
6f3693d918 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48957d9e2b -s ours am: fc6f490526 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d60cadfedcd8adb650dd05b3180edfac58ec67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 22:59:58 +00:00
TreeHugger Robot
b6a7400f6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d1dbd3e1e -s ours am: bcba6207f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2fa5a285a65e2f456102b5c958249a3b3a10de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 22:59:52 +00:00
Bill Yi
a3b4554682 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1051b47c26 -s ours am: 6bb86d9a10 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3536f5d9c56f37bcf6a57249661d1ae5b5d59aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 22:59:32 +00:00
TreeHugger Robot
affadf9e9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2593eaea99 -s ours am: 9a3c028594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06248844e1333ce70606966aa34f576479838eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 22:59:20 +00:00
Bill Yi
a165e66eb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f -s ours am: eb1157c0d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14a661b55940cb1c8f4429844eb788a6c489d578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 22:59:16 +00:00
William Escande
1d6757782c Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: Ia76738046150ec93c055479541944df25fa8673c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 22:53:11 +00:00