PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,403 Commits 1 Branch 0 Tags
fc118cbc74f48acfb27f878b0ce32f122f67d43c
Commit Graph

124403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Becca Hughes
2727a730ee Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: I0eefbcc9008570a6d47436ccd49e2be23b160a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 23:35:42 +00:00
Becca Hughes
63f71a54e4 Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: Ic56c750748920a3c568199c20a2717b453af359f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 23:30:50 +00:00
Treehugger Robot
ae7e77574e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: 0e084ba633 -s ours am: 3a1955f7e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb53c74f88cdadd09f7ce830ad93b3be547b96ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 23:03:36 +00:00
Bill Yi
a033231b90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: b9e6bd201f -s ours am: 100c003117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dea768f9c87d2418bd031ac9672945cee5ffeb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 23:02:57 +00:00
Becca Hughes
ccd03c9e70 Merge "Update string based on new mocks" into udc-dev 2023-04-25 22:51:39 +00:00
Treehugger Robot
e7ab278e0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: 114f7ae8a2 -s ours am: bb734a9397 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23e5d83de76da85074e304a28866ef884d7abcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:46:24 +00:00
Bill Yi
4ff6d2ae5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: b0cb91a1bc -s ours am: 5fb8a7edcb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f8bd44668982c25cd601bc80582287884775ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:45:43 +00:00
Treehugger Robot
e8fb45ba75 Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp am: 2fbc693eaa am: f7660ac12b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: Id90af208e5dd5dc8b0b2b0ec0d4583eb38042a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:07:37 +00:00
Bill Yi
c22f635211 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab 2p: aaa28fb0e7 am: 6c113d0c54 -s ours am: 47cb4197f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id11619f0b0b5b23d2055d0ce0061be214f11616f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:06:38 +00:00
Treehugger Robot
054b8294ae Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: f91d762067 am: f928142955 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: If7065291551e9fd0ca9366980bd3030eb53dca28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:50:18 +00:00
YK Hung
fb7527f1fd Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733 am: 245759ba42 am: 1b9cdf1ac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117

Change-Id: I302604e8c3d1026486b1c87ddf0ab5fd58b2f742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:49:25 +00:00
Treehugger Robot
8965d5e5e7 Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 525000b2ab am: 92d559063f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: Iaa5af9f361aa09b601a532500be5a90c11946d24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:48:02 +00:00
YK Hung
ee0c19a841 Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733 am: 8c1bae8a06 am: 79042d3db5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117

Change-Id: I3a29fb0a7c2ee28508ffcbbba09333f097baaee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:47:48 +00:00
Fangqiu Su
14dd0af87c Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 am: 8d16e20d78 am: 29f3d022f7 am: 924208bb0f am: ef47b4b811 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I533e328fda6796e068f42b5477988a2448b156ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:47:38 +00:00
Matías Hernández
93dc316043 Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c am: cb13bd964d am: 92799de2d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: Ifc0cbfdec68d1078a9fbd9dd9a8ce847f782a4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:47:25 +00:00
Matías Hernández
dd4260e7ee Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c am: 8a98f248c1 am: f661eb5fdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: Icbe690bb36205c97107070a46429b1be02b61ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:47:14 +00:00
Fangqiu Su
57d3f995d2 Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb am: 378e7af38e am: 5ce99863ea am: 064c80b470 am: c606c6f0b2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I83c8b2d6d5d145be65b546d547bdd6a70777d7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:47:04 +00:00
SongFerngWang
a81e0138b8 Replace the SlicePreference with Preference am: 794fc58235 am: c054498357 am: eea3722ae7 am: 7974416ca3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I058f19be8e37306005450036309431b9572be601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:46:51 +00:00
SongFerngWang
7d4736200e Replace the SlicePreference with Preference am: 794fc58235 am: c054498357 am: 04f9745471 am: 6f36baf641 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: Idae29d9dd3cbf2853477c454dd5e5d68513967b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:46:27 +00:00
SongFerng Wang
0e860f9aa8 Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae am: f929dc6dea am: 4b8ac3daa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: Ia45a2d62816e193a75390366f0683f944a3357b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:59 +00:00
Treehugger Robot
8a224766dd Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826 am: 885801abc2 am: 505b391a41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519

Change-Id: I20584c36a412d94840ab77741affc5812790a910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:45 +00:00
Zaiyue Xue
64209985f9 Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5 am: 43ea982e9e am: e3578cc82b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776

Change-Id: I9906052bc9766b51bf1e3a50c625688dc7263586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:34 +00:00
Zaiyue Xue
a6d413548b Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997 am: 65347f07ce am: 902ece0ba3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: I8b04f23c9ec4299833e34be24ba981d7df79e270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:19 +00:00
Zoey Chen
1f76047c99 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 am: d014b55e01 am: 26065748b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: Id1c4025852066bd6583fbd055e0e304db389ffe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:10 +00:00
Zoey Chen
2cf6609f83 Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 am: 221a58918c am: 017f916957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: If7bec6e2d9a446377e2aebbe54e283cc6f6ec480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:45:00 +00:00
Treehugger Robot
d10aadc416 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826 am: 9b25f5ac88 am: 14cd4ca61a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519

Change-Id: I2b2b87df99fa9c7cd200acf0aaae86f3b1a6ef9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:44:47 +00:00
Zaiyue Xue
7f03e36e39 Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5 am: 796c2ef5ca am: ac87cc3cf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776

Change-Id: I86e40165d4c9026f682148f480627d984d018da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:43:46 +00:00
Zaiyue Xue
bab85fc2cc Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997 am: 8892fd48ca am: d71ead4afb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: If360a01ca1d8c636c8cfd49124fbf19cc62538f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:43:34 +00:00
Zoey Chen
91f1d9642d Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 am: c28a5c3431 am: ea0f1b4bc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: Id077ddc17bafa2c0bfa8a64c72c7295239a4b7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:42:20 +00:00
Zoey Chen
b6af21adfa Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 am: 609b91c715 am: ca01227cbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: I9ca9bbf8f966832942ec1a0108ba8f934c862dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:41:22 +00:00
Lin Yuan
210225128d Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 6c3155eb61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I2cc79eca082044e37e7ddce2e9982f8372c2d638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:29:09 +00:00
Treehugger Robot
d4e2709506 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: 0df1e40d65 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f7bfc71ff5ed20b2e7007b9d146741b00b2a762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:26:17 +00:00
Lin Yuan
f94aae1766 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 42188dcd5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I64705175f3a4ff791baf2cece3b528f24814bc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:24:56 +00:00
Lin Yuan
7d2f92b77e Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 383923a4df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I34b6aaddeecbfa05953b5a568d4890c679c6a915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:23:13 +00:00
Lin Yuan
383923a4df Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I95812cb79e5e8ff8bce5f9af9e1eff79aee44e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:21:46 +00:00
Treehugger Robot
be3f127d91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: a937eb6cfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9885d6779e156715f0c26e6199ecfa4451a4fcee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:17:41 +00:00
Treehugger Robot
13b2843d72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: 485ae146de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18a5daad08d50f46a1736e308e82ed530115b810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:14:45 +00:00
Lin Yuan
6c3155eb61 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: Ie2f5204a3a4d0dc4372fc7bfb8582502da792e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:13:55 +00:00
Lin Yuan
42188dcd5f Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: Id62429c88143a63acba005d035d4c4d2699e26f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:36:28 +00:00
Lin Yuan
0bb504c42c Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev 2023-04-25 19:31:35 +00:00
Treehugger Robot
a937eb6cfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a0245aced46e867e7de680ef15dde00fc6d3e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:29:20 +00:00
Treehugger Robot
485ae146de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b72c194d13f9087b43a420433b3126291b2920c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:27:38 +00:00
Treehugger Robot
0df1e40d65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id119791e36ea8b96cd2a4046fd00c76ff2a2f0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:13:12 +00:00
Treehugger Robot
3747961aaf Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: ed9f22b78a am: 5f160e1562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: Ib32605bc57d46f94d98a58b2e077687475e872f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:38:09 +00:00
Bill Yi
5d77d702cf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 0a2936d879 -s ours am: 37fab052e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic46a93e21054d71f41c8d781dd3255412af49dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:37:32 +00:00
Treehugger Robot
51b5a14dc8 Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: b0bcad3210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: Ib5acbdb5714516048b9bc687900dba997d0167e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:49 +00:00
Bill Yi
62f0a5d938 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: 9bd3a732d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ace9cae4ddd13aeafdb614a2c22d1b311abbd7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:10 +00:00
Treehugger Robot
c7f8ae5369 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5c9a7f04b6701169c45039cd955bd356a86a240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:07 +00:00
Automerger Merge Worker
a4087417f0 Merge changes from topic "am-2885c7fd0b6a4f7fb5c86c6e0f3706a9" into udc-d1-dev-plus-aosp 
* changes:
  Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: 281aaed283
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: 457185d226 -s ours
 2023-04-25 18:20:57 +00:00
Treehugger Robot
c25e21398f Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: 281aaed283 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I439e777d9c7c5723dd3fb3fb4f9f9e7fde062291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:20:08 +00:00