PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,556 Commits 1 Branch 0 Tags
f703764efddbb9ddc218ef0e3ec5d22e9aaf87af
Commit Graph

126556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f703764efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 60f8d67f1d -s ours am: 48fa611907 -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: I7083cb39af52fa39087d7735db2c7b3cd45cede5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:58:20 +00:00
Bill Yi
d6d923c325 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 6cb8b3b00c -s ours am: f44874ca83 -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: I56d347d8ef8a3076de90d6ab4c39c332b7d364a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:58:17 +00:00
Bill Yi
e8993b5116 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: 392e63d166 -s ours am: e4a787f1f0 -s ours am: dac919f41a -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: I2ecd960decf8b10f7505f7625bb24d4ca6745bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:57:14 +00:00
Hao Dong
ae04426d02 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598" into udc-qpr-dev am: 0df79b1ccc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I364fb2e57fccd35f15a4adb61918ac2a8568ff9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:54:11 +00:00
Zoey Chen
c3bd5c2059 [Regional Preference] Add metric in Regional Preferences am: ca617d8612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23817103

Change-Id: I8aa917c29aab30def405455d1465be64032335b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:52:46 +00:00
Hao Dong
0df79b1ccc Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598" into udc-qpr-dev 2023-06-27 05:37:33 +00:00
Zoey Chen
ca617d8612 [Regional Preference] Add metric in Regional Preferences 
Bug: 279918056
Test: manual
Change-Id: I71a16a96f2e647945b20cbfeee63d96b0f3a188f
 2023-06-27 05:16:28 +00:00
Hao Dong
ed83c055df Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 am: 93bcf8122c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I9fc884ce09f3858c53e7fe9fea2a664ac32f3e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:49:52 +00:00
Bill Yi
07c5c9d710 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 5f53b4c10e -s ours am: 5f846bb466 -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: I4a34153ae7b2389c7e84652ea6eb01a97680a604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:46:38 +00:00
Bill Yi
f795b00b5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: e1dc1a0748 -s ours am: 587cddef51 -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: I0b62529b7e69220452eacc2014b9bf604d697afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:43:47 +00:00
TreeHugger Robot
48fa611907 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 60f8d67f1d -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: Ia5603c0cf61378817b36a2d933667220f536ac32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:34:14 +00:00
Bill Yi
f44874ca83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 6cb8b3b00c -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: I30bda311566714246e07507b8c664dfba85c6066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:34:10 +00:00
Bill Yi
dac919f41a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: 392e63d166 -s ours am: e4a787f1f0 -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: I8e49ca184085c44061792d9fd8247b4193938b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:33:14 +00:00
Hao Dong
ae87a68cda Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I405d8bbbde142073214adbf663813f25667835fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:31:41 +00:00
Hao Dong
93bcf8122c Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I0b509bd402107442b93f6855f34389dfa61c59e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:26:53 +00:00
Bill Yi
5f846bb466 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 5f53b4c10e -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: Ic4f33decef8093aed197c68e69afbb34d0fe0976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:09:32 +00:00
Bill Yi
587cddef51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: e1dc1a0748 -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: I5a7199c80bde4ac8e7710606bfd4fb84be0d6eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:02:07 +00:00
Hao Dong
be823bc598 Wait for systemui udfps overlay ready to show settings udfps enroll view. 
Previously, we show settings's udfps enroll animation view (the fingerprint icon and progress view) once the FingerprintEnrollEnrolling is shown.
However, touch events have to wait for systemui's udfps overlay to be valid. This CL lets settings's udfps enroll view wait for systemui's overlay.
1. Sets udfps enroll animation view's default visibility Gone.
2. Propagates FingerprintManager#onUdfpsOverlayShown to
   FingerprintEnrollEnrolling and when it's called, set the enroll view
   visible.

Besides, this CL renames onPointerDown() and onPointerUp() with Udfps.

Bug: 280718879
Test: atest FingerprintEnrollEnrollingTest
Change-Id: Ieed3e74c182828918785edcacb021f19a3665f2a
 2023-06-26 20:21:05 +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
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
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
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
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
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
TreeHugger Robot
60f8d67f1d [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: Ib0d7180f1f7dc67744917dcbeb953b11d7f8b060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:15:06 +00:00
Bill Yi
6cb8b3b00c [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: I66740e6fc05874d959352ffbedafe8e277ef5eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 03:14:51 +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
d2f8ae2555 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-24 01:57:54 +00:00
Bill Yi
0128198cb8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-06-24 01:57:54 +00:00
Bill Yi
41c2941f15 [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 skip reason: subject contains skip directive

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

Change-Id: I3f1151bedda9c93d556d6af9070fba99daef4fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 01:51:25 +00:00
Bill Yi
1ce6572543 [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 skip reason: subject contains skip directive

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

Change-Id: I8aea0ec01e50a869108dd923ee6383deb851c11a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 01:48:08 +00:00
Bill Yi
d80924b335 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 3040828b99 -s ours am: 6776568ed6 -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: Iff64ad0d4fad050c82a65eb5c1fda4cb1c693661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 01:34:11 +00:00
Bill Yi
28d0e5da74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: 359a96eb80 -s ours am: a326705d46 -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: I75a6340ae7196c173c69ef15a7988e9e29d4e6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 01:31:12 +00:00
Treehugger Robot
6b26eedb12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3c796f10fe -s ours am: 2c2e85e8ae -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: If0e60f41a1d9f34f8e4466b4ebc0832d322ad336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 01:24:30 +00:00
Bill Yi
504065164e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d772bd36b1 -s ours am: 17da3f14c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8fc81c409b431f044d848eb73af0306fa2f9b363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 01:24:10 +00:00