PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,364 Commits 1 Branch 0 Tags
fcae147f58be3b6441ce9e03bc59515af0d53ccc
Commit Graph

109364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
768cc4e9a8 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: c59c58e1d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: I6c9503a503d4f31b3982a912461b838f715a19d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:58:57 +00:00
TreeHugger Robot
f0c6b080a3 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: c59c58e1d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: I74d9f38dd22294909ac6a5282e030b74d2093585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:58:56 +00:00
Automerger Merge Worker
7cebb74e17 [automerger skipped] Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp am: 9ffd7ecd8f -s ours am: dfbaf8a22a -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 0167a4d8a6 is already in history

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

Change-Id: Id7dea12b61a0f50670cd1d01efdbf71618a65281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:41:13 +00:00
SongFerng Wang
36948d4b6a [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours am: 19f9b738f7 -s ours am: 45fa5ccf19 -s ours am: 284c20c00d -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: I1ffc1e976c8aa7cd72fd004ee360c4f601bb7f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:41:11 +00:00
SongFerng Wang
b44817c730 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 -s ours am: 8b4806562e -s ours am: 934d7d9058 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Ic14a16c1632e50a8e97df31415447b3c4617dd6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:41:01 +00:00
SongFerng Wang
f42fa9e9eb [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 am: 266a0ad585 -s ours am: bd6fc24bb5 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Ib26c57a9025c008cbde4dfb2f831438d5dbcb3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:40:49 +00:00
TreeHugger Robot
c59c58e1d3 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: I9f1a431164072830f6072a120adbaf125b325e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:32:33 +00:00
TreeHugger Robot
82e1dbfbe4 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: Ia3a06bbe0edbc369cb71a2a4f807a2061aff5783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:31:00 +00:00
Automerger Merge Worker
dfbaf8a22a Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp am: 9ffd7ecd8f -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 0167a4d8a6 is already in history

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

Change-Id: If68fbab0c9505e78ca7efa6fc9d8fe1a2ddac8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:23:11 +00:00
SongFerng Wang
284c20c00d [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours am: 19f9b738f7 -s ours am: 45fa5ccf19 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: I2345472feaf0ae9e13528ed5892233b97304c123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:23:09 +00:00
SongFerng Wang
934d7d9058 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 -s ours am: 8b4806562e -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Ia927ff15e6f3b27c22444c3cb5ba68311994dd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:22:59 +00:00
SongFerng Wang
bd6fc24bb5 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 am: 266a0ad585 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: I57b55f7447ed7c4b89d8a4c996c52c0f3bbbdd49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:22:46 +00:00
TreeHugger Robot
39eb991aa7 Merge "Fix crash when operator name contains %" into tm-dev 2022-05-23 15:16:36 +00:00
SongFerng Wang
266a0ad585 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454

Change-Id: I97731177e18ff3aeab109656b7e639bcfa91a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:48 +00:00
Automerger Merge Worker
9ffd7ecd8f Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours am: 19f9b738f7 -s ours
  [automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6 -s ours am: c9a5086f3b -s ours
 2022-05-23 15:07:43 +00:00
SongFerng Wang
45fa5ccf19 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours am: 19f9b738f7 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Ie86bc8f0ba092eb1dd17033a1db0b7e416489f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:39 +00:00
SongFerng Wang
8b4806562e [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Id4019f316ea642eacf4820e16c4c3b6d70609d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:38 +00:00
SongFerngWang
aef126d3e6 [automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6 -s ours am: c9a5086f3b -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: I2841769e5425b26a7b9033c11a17436d277a4aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:38 +00:00
SongFerng Wang
a0553c9d16 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454

Change-Id: Ib62bae9b56074c7e7dd2d3a652f6a4075cf78e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 14:50:28 +00:00
SongFerng Wang
19f9b738f7 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Iba28e980ce4e2dfd37375761f96396c816ca7086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 14:48:48 +00:00
SongFerngWang
c9a5086f3b [automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: I112177ccab0ef01edad24830e01503390471e5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 14:48:45 +00:00
SongFerng Wang
96bd20dca4 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev 2022-05-23 14:23:39 +00:00
Treehugger Robot
1b653cfbf0 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722 am: fe16309442 am: 4b8ffacaf6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I8c602a6b567853c610801962cdaac9039ff701c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 12:07:52 +00:00
TreeHugger Robot
00d8cf19eb Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: 07cb063579 am: cffca31ba3 am: 4de260a175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I63d5ac946e46537d4e8f467e8ddf24b251293992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 12:07:25 +00:00
TreeHugger Robot
7566ef277f Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 197b3072b5 am: 9d14efffd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I131913f5f6915ce8bb5e17a2c93440b52ab00646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 12:06:46 +00:00
TreeHugger Robot
9ca268725f Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 2a34e48069 am: e18662f02a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I05377d92c003f279f79e19430d7e75310fadef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 12:05:59 +00:00
tom hsu
7e27ecb91e [Panlingual] Fix icon shall have work badage in work profile. 
Bug: 233064114
Test: local
Change-Id: I8aa24373f0381b172c30d16aedb2f9ba97238234
 2022-05-23 19:34:51 +08:00
Treehugger Robot
4b8ffacaf6 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722 am: fe16309442 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I2368c602b04e7f0dbc123b2b2c258147054a893b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:31:04 +00:00
TreeHugger Robot
4de260a175 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: 07cb063579 am: cffca31ba3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: Idf664515e7daa28e3a1bc394eb86883cbb3c9e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:30:55 +00:00
TreeHugger Robot
9d14efffd5 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 197b3072b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: Icf3a52168eaa2bcfd4bcfa03e7d06fcbc26f4ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:30:47 +00:00
TreeHugger Robot
e18662f02a Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 2a34e48069 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I22871089af43978fe448825e37bbe7a1faa3e5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:30:10 +00:00
Treehugger Robot
fe16309442 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I4effb7ecf2aeec745a6e6918ca80f76ef1d58478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:51 +00:00
TreeHugger Robot
cffca31ba3 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: 07cb063579 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: Ice4443404f8d4d73c69db8fec4510069fa1a367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:42 +00:00
Treehugger Robot
38f8c61722 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I9e3a0b69e3baf2c0691c898acda20d6a0b65b953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:27 +00:00
TreeHugger Robot
197b3072b5 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I87164cccc6b47247bb4db42d122f301c75647d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:16 +00:00
TreeHugger Robot
2a34e48069 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I8d2bd68530fc32cae6b354dd1e6c7df3ce3119b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:15 +00:00
Chaohui Wang
02eb0aa980 Fix crash when operator name contains % 
Currently, cannot use ListPreference.setSummary() when the summary
contains user generated string, because ListPreference.getSummary() is
using String.format() to format the summary when the summary is set by
ListPreference.setSummary().

Use preference.setSummaryProvider() instead, which is recommended for
ListPreference.

Fix: 233295254
Test: manual
Change-Id: Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39
 2022-05-23 19:02:20 +08:00
TreeHugger Robot
ac572e72a6 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I0a317f53e6578ee245d54c3993267ab08d803161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:53:24 +00:00
Treehugger Robot
2b7eb9eff6 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I5685d61f33acf4fbf4b5ff8356a487f77d314bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:52:07 +00:00
TreeHugger Robot
07cb063579 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I470de9e89f9b36b2797a8260d7617e96712c52da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:51:57 +00:00
TreeHugger Robot
02d3965634 Merge "Simplify the duplicate click checker logic" into tm-dev 2022-05-23 10:24:18 +00:00
Treehugger Robot
97b4621c68 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" 2022-05-23 10:21:02 +00:00
SongFerngWang
0167a4d8a6 [LE unicast] Disable the "phone calls" when LE is enabled 
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.

Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
Merged-In: Ib507352107c0d825b8c7a9605713bc9083259fbd
 2022-05-23 17:34:48 +08:00
Håkan Kvist
6f1b6e3693 Call CardDatabaseHelper.getInstance() when used and not in onCreate 
Providers can be created before onCreate is called on the application.
Calling CardDatabaseHelper.getInstance() too early will cause
ContextualCardLoader to call getAppllicationContext before application
has been fully started.

Postpone calling CardDatabaseHelper.getInstance() until database is
accessed.

Test: Start device with sim card inserted and Pin enabled on sim.
  Wait some time before entering sim pin. After entering pin, open
  settings. Verify that settings does not crash.
  Verify that there is no contentProvider exceptions from settings in log.
Bug: 154076590
Change-Id: Id0b6294ca2aeebdc71076299928c4dea5145ba33
 2022-05-23 09:08:30 +02:00
Angela Wang
35387d3d4c Merge "Add a button to the accessibility button tutorial dialog that links directly to the settings page." 2022-05-23 07:00:33 +00:00
Bill Yi
66ed1dc370 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours am: 3304393c1b -s ours am: 476e1c93da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifba99c0a251b4f4b69b96cea067cb332c75e53ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 06:12:29 +00:00
Bill Yi
43717a0789 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: de1793faf0 -s ours am: a62ca13292 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I878c4411a9616a3b064a84bc2c30d0be7c3200ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 06:11:28 +00:00
Bill Yi
51b428f889 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: c7bada8348 -s ours am: 9c89e876e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifde2954882cf3d23e0764a318409527a1b90395a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 06:10:01 +00:00
Bill Yi
476e1c93da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours am: 3304393c1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib588cbf1f007dfe264e5956e9f366a179092adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:47:42 +00:00
Bill Yi
a62ca13292 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: de1793faf0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a1cee04c15721dea08f7877690e43f18d552eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:47:07 +00:00