PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,166 Commits 1 Branch 0 Tags
5f8620d57117f9f0fcdfdc7c220f4dc4d05098aa
Commit Graph

131166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Milton Wu
5f8620d571 [BiometricsV2] Refactor EnrollingUdfpsFragment 
Refactor FingerprintEnrollEnrollingUdfpsFragment to kotlin and add
bindView() method for it

Bug: 286198032
Test: atest FingerprintEnrollmentActivityTest
Test: atest BiometricsMicrobenchmark:biometrics-enrollment-test
Test: Manually test enrollment as Udfps device
Change-Id: Ife1e14ffabc4716acc53b67f641ba9cf159319f2
 2023-06-27 07:12:50 +00:00
Shawn Lin
5f17b1c9da Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev am: bf7b928f0c am: c7e8393778 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726369

Change-Id: I2a7dbaa9f9078e47683a0ecfbba7a99892f9c8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:46:51 +00:00
Chaohui Wang
f769955aba Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev am: 99b29e068e am: b3a06d46fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23761226

Change-Id: I5fe997d593c89ac5122e51eaeff958ae59ea63c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:46:17 +00:00
Shawn Lin
c7e8393778 Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev am: bf7b928f0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726369

Change-Id: I37bd5e0669292a784478ddd748b8c51c5947cd06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:01:52 +00:00
Chaohui Wang
b3a06d46fa Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev am: 99b29e068e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23761226

Change-Id: Ibeca1686a558a5f9fd9f55bec93169d34f3549fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:01:33 +00:00
Shawn Lin
bf7b928f0c Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev 2023-06-26 06:43:36 +00:00
Chaohui Wang
99b29e068e Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev 2023-06-26 06:21:38 +00:00
Treehugger Robot
96e8030453 Merge "Fix back key display issue in the split-screen" 2023-06-26 06:01:24 +00:00
Sunny Shao
4b1e982898 Fix back key display issue in the split-screen 
- Move the back key display module into the onResume.

Fixes: 280005953
Test: manual test
Change-Id: I289c5fab678fde8345a35d7909307f153a0d812f
 2023-06-26 11:23:28 +08:00
Treehugger Robot
4ce984873e Merge "[BiometricsV2] Refactor FindUdfpsFragment" 2023-06-26 03:22:23 +00:00
Treehugger Robot
f644912212 Merge "Stop the searching of broadcast" into udc-qpr-dev am: c97fe1a27f am: f75356ca21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23744199

Change-Id: If6e8441947bd9bd7dffcda74be514ab98a1df3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-25 19:39:56 +00:00
Treehugger Robot
f75356ca21 Merge "Stop the searching of broadcast" into udc-qpr-dev am: c97fe1a27f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23744199

Change-Id: I74132b143b5312886d27ddf6f8e5eb3bb74ce9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-25 18:52:19 +00:00
Treehugger Robot
c97fe1a27f Merge "Stop the searching of broadcast" into udc-qpr-dev 2023-06-25 18:11:03 +00:00
Bill Yi
5464140360 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 616457304e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib859d17dfd456541ef8a06f24dce88c605226108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 18:22:53 +00:00
Bill Yi
3b1954425a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 137f4ad8fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If02df9eefb465e99c5101051eba228b7132bed95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 18:22:34 +00:00
Bill Yi
616457304e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-06-24 17:35:14 +00:00
TreeHugger Robot
cb78cce78f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: 7239e2d59a -s ours am: 6c1f5635c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7b7c0858e8832480f1d5ec06d7ecbca59ab01f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:06:37 +00:00
Bill Yi
cd149e0be7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: 4e18461b69 -s ours am: 5bdd121377 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1da4cb65a14a01afdbdd2a5a1397e09b3e3fea85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:06:27 +00:00
TreeHugger Robot
59b6a550d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: a384319039 -s ours am: 3a29b94dd3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf2da393121c1025bcfe9ae936c16c4a4de91917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:04:32 +00:00
Bill Yi
23b2008e9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: edf68d6fde -s ours am: 015c56c372 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id88a9de924e205256d361d8133bf6ba0121f962b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 06:04:18 +00:00
TreeHugger Robot
6c1f5635c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: 7239e2d59a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I541fe8003433a314765599b7107e6452350e16e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:18:44 +00:00
Bill Yi
5bdd121377 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: 4e18461b69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e94ed89624bb0d50579a8991cac321bf090c56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:18:34 +00:00
TreeHugger Robot
3a29b94dd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours am: a384319039 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ca668d9d7a477b5b27ab59edefdba583262f08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:12:39 +00:00
Bill Yi
015c56c372 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours am: edf68d6fde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I512de0e15f4e82f44f27c866753f2f031726f72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 05:12:24 +00:00
TreeHugger Robot
7239e2d59a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I255f7cc58d393c76d2a77ca414ba0d45f5bc4efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:31:12 +00:00
Bill Yi
4e18461b69 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76a102b086f132dec6419781291db796d9c2203e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:30:57 +00:00
Automerger Merge Worker
bd3730a281 Merge changes from topic "am-1d0d7a7d70314ea2bea3244daa2f6aa6" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 949bb6d631 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 4438349c54 -s ours
 2023-06-24 04:27:23 +00:00
TreeHugger Robot
5f6dcbda92 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 949bb6d631 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie57a5de1e1dd164d7e92f92dce98a44cfd65636a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:46 +00:00
TreeHugger Robot
a384319039 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 3c67940884 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e28b8b1240a5cbd61b5d04a9940e8209ae79ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:45 +00:00
TreeHugger Robot
f1843ff8fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 636d316e57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I239cdb91af8b5e1b0587bed756f5adc3ba0bbd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:44 +00:00
Bill Yi
b9715e0ab3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 4438349c54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4103517ed7891e603e129afeba738da1f48cd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:32 +00:00
Bill Yi
740df4248a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: f5b3ef4010 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4f98eeb4bba1f2a577500f87d52daf671e47cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:32 +00:00
Bill Yi
edf68d6fde [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: e58596dd7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c2cd5123f0b246f34216ad4f9b774a4f06f02cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 04:26:31 +00:00
TreeHugger Robot
3c67940884 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib42a8d1aeb507f6893bea30502698b9a1a1de0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:49 +00:00
TreeHugger Robot
636d316e57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04eb5c9acd3f70f435e503f968d79548c93de350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:37 +00:00
Bill Yi
e58596dd7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8efcca9c0ca97ba62484aaeb557b9fd6bd00714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:37 +00:00
Bill Yi
f5b3ef4010 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c4945e08d5f23f2cca89bf427ed163eb87c8f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:28 +00:00
TreeHugger Robot
949bb6d631 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15565e6fd2315993e6fdd375e1069a2f60b12b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:26 +00:00
Bill Yi
4438349c54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33cc8a0a77a663bac76fae5fa568ffc5a4956325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:19:13 +00:00
Bill Yi
1f5aac124e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d2f8ae2555 -s ours am: e14b9921de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibde641d40934ad00c3af2c203842a45d17a10fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:00:18 +00:00
Bill Yi
7949b07077 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9ef01aae5 -s ours am: d7d9c5b01f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3ddf59b569c7774fa1906ed50c0c7cec6401aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:00:08 +00:00
Bill Yi
0a99383963 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 0128198cb8 -s ours am: eb2d55785c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib849d1b3ba983bca230924bf5ff0796d1227736f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:59:52 +00:00
Bill Yi
8080c42bdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a2d395a4c -s ours am: fba31cfbf8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a6ae7a9c64aa8de682fbd8085eacd98c9f46e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:59:40 +00:00
TreeHugger Robot
85a90ef00b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-24 02:45:00 +00:00
Bill Yi
e14b9921de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d2f8ae2555 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie27291588209fb17fbce9c5cfd4de3c99bc4d900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:35:44 +00:00
Bill Yi
d7d9c5b01f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9ef01aae5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b9cc0631e0fec62c05bbfa73bb31b11a71c48aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:35:37 +00:00
Bill Yi
eb2d55785c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 0128198cb8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic55e2f01f3821c29ca1be3d7f5045e1696748927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:35:28 +00:00
Bill Yi
fba31cfbf8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a2d395a4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6ce8d3b3c6d0e7f1b1cba735145162cf9c6c79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:35:01 +00:00
Bill Yi
a1ee23af42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 3040828b99 -s ours am: 368a950e2a -s ours am: 41c2941f15 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6da2ee6c650276809b81d69de735a9a7ab61abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:31:28 +00:00
Bill Yi
bb6e6b9d57 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: 359a96eb80 -s ours am: bf0d30964a -s ours am: 1ce6572543 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93b64d20944a527f459e5a78d82c9b3e0763d92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 02:04:25 +00:00