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

106372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tsung-Mao Fang
32145cc362 [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:55:47 +08:00
Tsung-Mao Fang
0eb3011fc2 [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:54:19 +08: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
0d8d05a221 [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:29:53 +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
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
Arc Wang
973a46134b [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:51:42 +08:00
Arc Wang
e3134c4a04 [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:51:05 +08: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
Arc Wang
67b9fb57ea [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:48:26 +08: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
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
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
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
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
TreeHugger Robot
4a0fa16423 [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: I087fa5ba6781a56717e49da368393b11b5d9e470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:15:10 +00:00
Bill Yi
63f15c33d9 [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: Ic7b942b83171e4032a767c985d1b98ebdc72887f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:14:47 +00:00
Automerger Merge Worker
30ff5d39d5 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 skip reason: subject contains skip directive

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

Change-Id: Iac8a28d947c5223cd58dc79ca2a43eb6630b1a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:04:01 +00:00
Bill Yi
36e6b1193e [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 skip reason: subject contains skip directive

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

Change-Id: I40e3582c4db1397bc65260b2e2de0517047c0e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:03:52 +00:00
Automerger Merge Worker
0b305213e8 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 2022-06-01 23:59:56 +00:00
Bill Yi
0cc390217a [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 skip reason: subject contains skip directive

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

Change-Id: I2439b9c848b9446e509d7160cb33f3ba02c8be71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:59:05 +00:00
Bill Yi
76e06146f0 [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 skip reason: subject contains skip directive

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

Change-Id: Iba8b1dd26e91cd15806d0b9c4a7e767dc100f62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:58:48 +00:00
TreeHugger Robot
34534c87b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -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: I1b8c9672581e4ee6fbf0533626d25f702a5c8e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:51:01 +00:00
Bill Yi
95fef514c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -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: I1a14edab2cb0cc8d0878cc0a0195db8b8ae816c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:50:35 +00:00
Automerger Merge Worker
7061016303 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 2022-06-01 23:37:05 +00:00
Bill Yi
379174bc44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: 8cfc636454 -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: I030af8457053799ab82cef16e26351c9e1841977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:36:05 +00:00
Bill Yi
cc8d9339f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: f32a1310e8 -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: I360e20aa0e0872cf3fa05a186aef147ad110d0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:35:54 +00:00
Bill Yi
88179366d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: f32a1310e8 -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: I7879e748fc5c44f294fb419e719001a0fa215486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:35:49 +00:00
TreeHugger Robot
9d995e75a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-01 23:22:20 +00:00
Bill Yi
f32a1310e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -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: Ifdda7468a22442cd0127a576d7d4bd8f9a0e24a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:05:11 +00:00
Bill Yi
8cfc636454 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -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: I5ac5e91be389bf3a7c8ff54c6f8c8bd924c35fd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 23:04:01 +00:00
Bill Yi
6620ba750b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -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: I30af08bada2f825641e1dc015b753bd242b63315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:40:56 +00:00
TreeHugger Robot
d022a621aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours am: c87249a086 -s ours am: b88be2407f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iced2e2c914497e3a47fc5594b983ac99041fc2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:42:52 +00:00
Bill Yi
433b10bcce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 43aefd5e84 -s ours am: f978e3ba2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ca241cd737ed39594370e8024a3892ad3cd72c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:42:50 +00:00
TreeHugger Robot
0afc741a04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours am: c87249a086 -s ours am: 64e9fb7420 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4b58df1f83caaf04000ff61fcba1478a56ac546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:17:38 +00:00
Bill Yi
91f2d555c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 43aefd5e84 -s ours am: 61a63c7d6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f444808ab655e7f4c64f171ea5e5c515aae62fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:17:36 +00:00
TreeHugger Robot
64e9fb7420 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours am: c87249a086 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1c2e2d4ffeeae9a189942e87c7b88310abd8e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:17:03 +00:00