PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,373 Commits 1 Branch 0 Tags
6b0a526193b54af08f6f045e2d0de541c3c2871c
Commit Graph

110373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
e133317dd7 [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours am: 397b8e1944 -s ours am: cefc2233db -s ours am: 67d6e25e92 -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: Ib7f895aba3bb9e846150d7ca126a165507e76ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:32:27 +00:00
TreeHugger Robot
25baef57f3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 05:15:53 +00:00
TreeHugger Robot
4704f5c76f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 05:15:53 +00:00
Betty Chang
67d6e25e92 [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours am: 397b8e1944 -s ours am: cefc2233db -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: Id406c5775233f6c6b56fea3a4d248105915cc871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:13:54 +00:00
TreeHugger Robot
3f205a646e Merge "Add Settings for back animation developer option" 2022-06-02 05:13:31 +00:00
Betty Chang
cefc2233db [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours am: 397b8e1944 -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: I68356e1c991a3ede129c97ebc1f06f1b8a9df91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:56:32 +00:00
Betty Chang
397b8e1944 [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: Ifa7c9df20a76fe233a4b48f2de06ef6a6774cbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:17:58 +00:00
Betty Chang
d131bdfbec Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2113244

Change-Id: I4d58377302a60869bce6cd4d2a70a6f61d35e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:01:11 +00:00
Betty Chang
e3295efcd0 Merge "[LE Audio] Broadcast Sink UI" 2022-06-02 03:34:59 +00:00
Chaohui Wang
4e32ab60d4 Merge "Clean up unused string resource sync_plug" 2022-06-02 03:19:49 +00:00
Tsung-Mao Fang
0e5c208a4f [DO NOT MERGE] Fix can't change notification sound for work profile. 
Use correct user id context to query the type,
so we won't get empty result unexpectedly.

If we get the null result, then we won't set sound sucessfully.

Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
 2022-06-02 10:53:18 +08:00
Tsung-Mao Fang
90968c8437 [DO NOT MERGE] Fix can't change notification sound for work profile. 
Use correct user id context to query the type,
so we won't get empty result unexpectedly.

If we get the null result, then we won't set sound sucessfully.

Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
 2022-06-02 10:20:38 +08:00
TreeHugger Robot
6c2f9458de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f198f55543 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia823d2ded7c820ceae93752088805e43b7e70d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 02:18:21 +00:00
Arc Wang
46e00dc6df [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 10:17:47 +08:00
TreeHugger Robot
b0888ecfae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 4a8654a687 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbc8e296d75c1a1de463821b7dd4187b3a2b702f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 02:16:17 +00:00
TreeHugger Robot
f198f55543 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-02 01:56:17 +00:00
TreeHugger Robot
f658104418 Merge changes from topic "tc_change_22060107_28" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a571f069ee
  Import translations. DO NOT MERGE ANYWHERE
 2022-06-02 01:56:17 +00:00
TreeHugger Robot
4a8654a687 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-02 01:56:17 +00:00
TreeHugger Robot
3adaaba220 Merge changes from topic "tc_change_22060107_28" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac0cd8d7ff
  Import translations. DO NOT MERGE ANYWHERE
 2022-06-02 01:56:17 +00:00
Arc Wang
73985c8296 [DO NOT MERGE] Fix Settings crash when setting a null ringtone 
Ringtone picker may callback a null ringtone Uri
if users select None.

This change pass null ringtone Uri to RingtoneManager
and return.

Bug: 232502532
Bug: 221041256
Test: maunal
      Settings - Sound & Vibration -> Phone ringtone
      -> My Sounds -> None
Change-Id: I044b680871472a3c272f6264c4ef272df542112e
Merged-In: I044b680871472a3c272f6264c4ef272df542112e
 2022-06-02 09:49:30 +08:00
TreeHugger Robot
39dfb8038e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: 4a0fa16423 -s ours am: 72792c9c10 -s ours am: 1159c2f7c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia77d02695dd6947d6cf191c9973b58cecc68adcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:25:55 +00:00
Bill Yi
7778488682 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 63f15c33d9 -s ours am: 8caffec284 -s ours am: 82c5c11827 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4360f285f0c87534403cec6667265c9ef403b775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:25:35 +00:00
Automerger Merge Worker
0e799ff6d9 Merge changes from topic "am-19c8f316ee894aa0a901506f702ec1fb" into tm-qpr-dev-plus-aosp am: 0029cf5ffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280

Change-Id: I0230a2e4d1144b17ed8f521d52f4c9f539fab97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:19:15 +00:00
TreeHugger Robot
e0035b2603 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 6c801a5454 -s ours am: 428e03d24a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41e7ce5804e8eb0039476a60bb81f63ecaf815f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:18:59 +00:00
TreeHugger Robot
ba2a41219e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 73bfce4c4c -s ours am: 4030de6046 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f9b2a758a48d4a7ad19a02f00af33952e5506d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:13:18 +00:00
Bill Yi
1f3ed7d8ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours am: 237335386d -s ours am: 86aa7618cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22d58c51a860dc902c00d8fffbcfd3bf6db5c9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:12:59 +00:00
TreeHugger Robot
1159c2f7c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: 4a0fa16423 -s ours am: 72792c9c10 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If15e3bf7bd9adafb2be88c1860395a250176f96b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:50:20 +00:00
Bill Yi
82c5c11827 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 63f15c33d9 -s ours am: 8caffec284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d56bb78737a15ac1261af04940ad1ece4a76678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:50:03 +00:00
Automerger Merge Worker
0029cf5ffa Merge changes from topic "am-19c8f316ee894aa0a901506f702ec1fb" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 6c801a5454 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours am: 5f961ab2f5 -s ours
 2022-06-02 00:48:27 +00:00
TreeHugger Robot
428e03d24a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 6c801a5454 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f4fd3be721985779979345e717162a0bdc66939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:47:38 +00:00
Bill Yi
fcb7dc5743 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours am: 5f961ab2f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic92d95d9ec2726eec4a181919e43f0e41b633452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:47:20 +00:00
TreeHugger Robot
4030de6046 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 73bfce4c4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic07aa6d3c779895d6d4c9a70f58d4fc00a8feb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:47:11 +00:00
Bill Yi
86aa7618cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours am: 237335386d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a88806c0ff8029729031340d62628433ddcb9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:46:55 +00:00
Automerger Merge Worker
d04be95bbf Merge changes from topic "am-2bb72cf9352c40ea9ca495e5409b726d" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: d3fa68ae4c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 62df895260 -s ours
 2022-06-02 00:33:38 +00:00
Automerger Merge Worker
daf56b0dd5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: f32a1310e8 -s ours" into tm-d1-dev-plus-aosp am: 7061016303 -s ours am: 30ff5d39d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27c6b460b1b43b97cf2f6fa2efd78ce08dca49db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:32:24 +00:00
Bill Yi
41cf2dd03d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: f32a1310e8 -s ours am: 88179366d9 -s ours am: 36e6b1193e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7de26027a90b734cce209839782615c82fc55120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:32:17 +00:00
TreeHugger Robot
72792c9c10 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: 4a0fa16423 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id897931683b242ac7c0ac56177c6f9d67736fb06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:32:12 +00:00
Bill Yi
8caffec284 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 63f15c33d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ca5843c8fa5ece7ab4e395ccb2703bc143efc28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:31:56 +00:00
TreeHugger Robot
178ff32df2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: d3fa68ae4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9afbe4e18e0e29d4069e160b2e1280751a13134d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:31:34 +00:00
Bill Yi
433e08c5c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 62df895260 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf7b8086a894c23e3f8bb452645f0c6892dc955e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:31:13 +00:00
Automerger Merge Worker
283c7662c4 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: 8cfc636454 -s ours am: 379174bc44 -s ours" into tm-qpr-dev-plus-aosp am: 0b305213e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95e5f81b16a9d1f6feb7ef82e5504ad492a9947b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:28:28 +00:00
Bill Yi
d4ee626eeb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: 8cfc636454 -s ours am: 379174bc44 -s ours am: 0cc390217a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I638761a756a16a6d587506fd232b2e0f2d30ee41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:28:21 +00:00
TreeHugger Robot
6c801a5454 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9908b74bb1c49cfc4c9782f00d87171fa68d4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:24:32 +00:00
TreeHugger Robot
73bfce4c4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6856085af687f344ec39fa21a8719526acdc6ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:24:15 +00:00
Bill Yi
5f961ab2f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14112f3f9ddb1678ca21641c587d3bb4b58898d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:24:15 +00:00
Bill Yi
237335386d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ed6506676648dba77eeb5b183a5c52f74462198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:23:56 +00:00
Bill Yi
b683e54cb1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: f32a1310e8 -s ours am: cc8d9339f5 -s ours am: 76e06146f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c741f49f49eecb95a8a9e6d0fe5236c95c7b013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:23:11 +00:00
TreeHugger Robot
a543e38931 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b85da8787c176a23783d96ceeeef9c42626f8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:16:33 +00:00
TreeHugger Robot
d3fa68ae4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22a44858160dfad39cd1d2d08a446d7dfb752d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:16:23 +00:00
Bill Yi
785071f7aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba42ecec9c0381990acf3c1c815037bb43ff22c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:16:13 +00:00