PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,722 Commits 1 Branch 0 Tags
148f0a85910c21c80d03f4b741cd1c83cfceaa0c
Commit Graph

106722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e7e935454f Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2022-09-08 02:32:31 +00:00
Treehugger Robot
f0c250900c Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a am: 1b69e6b87c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: I63721073b4e8032505b97413cf8064caa3497ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 02:18:57 +00:00
Treehugger Robot
1b69e6b87c Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: I16683a4e78350d713ab8a0f756d69581aa97526d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 01:46:51 +00:00
Treehugger Robot
451ced2f5a Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 01:02:07 +00:00
Treehugger Robot
6672e37864 Merge "Fix NPE crash in TextToSpeechSettings" 2022-09-08 00:34:03 +00:00
Oli Lan
449dce27a4 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 3c8578c22f -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I37acba556261d1409222b9d7e544dc20f29f7d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:57 +00:00
Oli Lan
c7a8479c9b [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 56abc7ad1a -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ie6c931e185e8c22ddb12d4a5ad7a3dd036593578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:41 +00:00
Oli Lan
92654ff5b3 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 2cdc09d71f -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I26bbe9761cde34d5ecedfde66233f9b2fd59b4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:28 +00:00
Oli Lan
601afe2f7e [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 43ecd848b4 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ib9e0a21a890e13c1a007868b1a387dcea8d1862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:08 +00:00
Oli Lan
3c8578c22f [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Iadbd31b60e5744a5b2532dc0cd64d21858efcda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:31:30 +00:00
Oli Lan
2cdc09d71f [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I09d0433fbe68aa510156bb4574b4c81ee6bc06eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:21:17 +00:00
Oli Lan
43ecd848b4 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Iaca6981e0651ef32ac1a388d446417f382447927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:21:11 +00:00
Oli Lan
9b9d0b2275 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ib8379f1b92400f4bd1b2b76a6c418216a44fce6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:18:29 +00:00
Oli Lan
56abc7ad1a [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I7aa5c978f0be7269e3a3211284d2d0ba6cf0b1e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:18:00 +00:00
Oli Lan
ff1de3711e [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ie0f4cc27e8ad3987f120a8c13ca033cc17972e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:54:20 +00:00
Oli Lan
7e67690072 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I98a5f814012718e1a31fb7a1935715e9d7756151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:51:18 +00:00
Oli Lan
54f0522027 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I1d62ca22214c2cb04c15545764864d65231d9230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:26:35 +00:00
Oli Lan
11484d510a [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ifa1eb07ec9264ea159064776d27c2fa2d2aeb1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:24:56 +00:00
Oli Lan
52f5f2ee31 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ic7660e922a883a8147447dad898d407c4f3d387e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 20:54:43 +00:00
Oli Lan
cbf1699cd7 Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: Id74cd5fe28cec05a3fd87fc5434d28fad639e1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 20:24:55 +00:00
Oli Lan
ff5b6611cf Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: I8cc4562420648436abb478b686adb96c28d8163b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 19:39:55 +00:00
Oli Lan
05ea36ddc5 Prevent exfiltration of system files via avatar picker. am: f70e351d1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058

Change-Id: If9321bf1035c0492396adf4ce3b6579dfe31c66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 19:01:32 +00:00
Bill Yi
e935326ab9 Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Change-Id: I60bd05c8418800fe8f9f432e11d4ca97d03e57a2
 2022-09-06 22:34:26 -07:00
Shen Lin
fa6a8e9767 Fix NPE crash in TextToSpeechSettings 
Recyclerview's getItemAnimator() is nullable so we need a null check.

Bug: 245383855
Test: Manual

Change-Id: Iebad430e81a32b7fa8ebe0543abf3f122befb7e5
 2022-09-07 10:26:39 +08:00
Treehugger Robot
41fc3efd4c Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8 am: d24f4a3f54 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: Ie5e21d09224749e8d8e2c321cff3d73bd21d3669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 01:11:26 +00:00
Treehugger Robot
d24f4a3f54 Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:41:43 +00:00
Treehugger Robot
a9c6040eb8 Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I57cb6db3271266734f2fe383de0d4575dad57cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 00:14:44 +00:00
Treehugger Robot
b2a466d92f Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" 2022-09-06 23:54:40 +00:00
Treehugger Robot
140d335571 Merge "Crash in PreferredSimDialogFragment" am: a512817aba am: 42cc405781 am: a4915b26f4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096

Change-Id: I16700abafd46e5d24964a7dc16aa45fd2c5809f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-06 13:33:49 +00:00
Treehugger Robot
a4915b26f4 Merge "Crash in PreferredSimDialogFragment" am: a512817aba am: 42cc405781 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096

Change-Id: If9f57b125c3e336cd6f10325e8e066f918000e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-06 13:05:24 +00:00
Treehugger Robot
42cc405781 Merge "Crash in PreferredSimDialogFragment" am: a512817aba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096

Change-Id: I0add210f4a071fb61b9647ba9a81518d050ff64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-06 12:37:01 +00:00
Treehugger Robot
a512817aba Merge "Crash in PreferredSimDialogFragment" 2022-09-06 10:28:38 +00:00
Shen Lin
0b9a6304aa Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page 
This patch contains two fixes:

- Make sure mUwbManager is non-null by calling isUwbSupportedOnDevice to avoid a NPE.
- Modify AdvancedConnectedDeviceDashboardFragment, add lifecycle observer only if device supports UWB.

Bug: 244871579

Test: manual test and Robotest.
Change-Id: I78f97794a66f3fb487f067c4570899e21c254acf
 2022-09-06 14:55:08 +08:00
Pingzhi Wang
77ce80d6cb Crash in PreferredSimDialogFragment 
NullPointerException when removing physical SIM card

Bug: 244622300
Test: Manual
Change-Id: Ie32c4d07e4c77a0460265a47501e332ae62e17e4
 2022-09-05 11:29:42 +02:00
TreeHugger Robot
892c5a54c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 63a4a1196b -s ours am: 2d0b98ca99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3936b5c8825b735e31a74730d3989a14b14876de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:48:45 +00:00
Bill Yi
e04a56746e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8835e20681 -s ours am: 7f7bf6920a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1ecd6f560443a22258404849ad5b9e82b607a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:48:30 +00:00
Bill Yi
94af5a0ba6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75445048e8 -s ours am: 838fce70df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6fe3f0e9c29ef791b70624216131945cf2bed0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:48:16 +00:00
TreeHugger Robot
5763bbd1b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours am: bb55f01a53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f9e6873ebd64f5bbcb858645945a93810277ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:40:19 +00:00
Bill Yi
0563d709ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours am: f84668d5ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife3543fdd33c39cb13b8f1f5b821e26714d87cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:40:02 +00:00
Bill Yi
9795b711c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: fb32967d7b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f95207f6b9b24aa3863c8ebe869cfca5b5badad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:39:50 +00:00
TreeHugger Robot
2d0b98ca99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 63a4a1196b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f5886c6d99255c8773a92e4316326d334528cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:20:41 +00:00
Bill Yi
7f7bf6920a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8835e20681 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec75130b912ea7a26f43249781f3af765e20f3a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:20:19 +00:00
Bill Yi
838fce70df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75445048e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45b0bac90cdab9431eca070b86e597eab58fd14d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:20:07 +00:00
TreeHugger Robot
4f2ed5b544 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours am: 7cfbf2e0d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8dff4217d026797a7c4b5b00083c8727161d18e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:09:09 +00:00
Bill Yi
6ae361a3bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours am: 810c7b6e7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaddafda8c6f7ff343c6ea23b4404939cd952e3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:09:00 +00:00
Bill Yi
8d02a428d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: 01a2a417e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea15ba9c400ca9d69ff83465eb86bdac45f04b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:55 +00:00
TreeHugger Robot
7cfbf2e0d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7b45a9b0171e9ec92cd776c3364c642f54f70d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:03 +00:00
TreeHugger Robot
42ca15e814 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbae89efd6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If20cc4735621981bf0f1de270be423213e1d6fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:08:02 +00:00
Bill Yi
810c7b6e7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51da3ed71a0456683db4a027a05f85ae262c13a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:48 +00:00
Bill Yi
d07051c249 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817a494d0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I568a2e42705cbca24b77e1baa84eb6dcbd8d023c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 21:07:47 +00:00