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

106854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Raphael Kim
8d749c55f4 Extract app label from component name in notification access confirmation UI 
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
Merged-In: I8613d9b87a53d4641c0689bca9c961c66a2e9415
 2022-06-01 22:24:39 +00:00
Weng Su
1f0689f73c Restrict network preferences settings 
- Show a restriction message if the malware enforces the network preference settings

- Remove settings search index if the network preference settings is restricted

Bug: 231987122
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest

Change-Id: I998aa084d47d556d1eeddcec8c6bb5f1d9a8f6e7
 2022-06-02 04:50:33 +08: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
TreeHugger Robot
b88be2407f [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: I6b89ebd1609157de26c4e12f9d3291cfc02f8e58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:16:56 +00:00
Bill Yi
61a63c7d6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 43aefd5e84 -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: I5e778e74ab7328e1e3cf2c38ee988142cb4a87fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:16:55 +00:00
Bill Yi
f978e3ba2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 43aefd5e84 -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: If4273ccba523a99ed0bcc5aa5cfb0f6487a39c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:16:53 +00:00
TreeHugger Robot
b50851d1a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours am: 70cdd5c5b5 -s ours am: 302533f636 -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: I0b78a21096c615e500787202de1f88c1014a33ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:15:43 +00:00
Bill Yi
98715f2084 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 8a85b26086 -s ours am: 355f78acc6 -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: Iccd1f7f3ed3131efa27dd4b494b64768bb68c0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:15:41 +00:00
TreeHugger Robot
302533f636 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -s ours am: 70cdd5c5b5 -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: Iff6fef02f37db97724e3723819d90a08733dc600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:08:01 +00:00
Bill Yi
355f78acc6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -s ours am: 8a85b26086 -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: Ic42b55f7d717602f495c2c0811f27f1232157828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:07:59 +00:00
Joshua Mccloskey
5f34ae0309 Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 3dd64a3e25 am: 0f27b0ab5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: I49fc372a55010ec9979515b4ab07193ae7770af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:07:26 +00:00
Joshua Mccloskey
63451e68e5 Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd am: 569a8b4073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: Iae0613e80126b30bd3af29c459a2e8e5859e3111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:07:01 +00:00
Joshua Mccloskey
8012fcd59b Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd am: c665d436d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: I506c28d6c531c1e3582d8553235b9fc94799a3f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 20:05:33 +00:00
TreeHugger Robot
c87249a086 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -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: I9d7fe289cca91bc36228e92d8d95315ffe5a51f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:50:44 +00:00
Bill Yi
43aefd5e84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -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: Ia00f3b7b516d14ba997c7a09d50c67d1e09fd20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:50:37 +00:00
TreeHugger Robot
70cdd5c5b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c705beea0d -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: I1d7afd78b111c3fa396339a430c6e2daf6d40140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:49:12 +00:00
Bill Yi
8a85b26086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e605531d0 -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: I0ec8e5a382eb8887ee7fedc3acfe14d8e21e6158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:49:05 +00:00
Joshua Mccloskey
0f27b0ab5c Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 3dd64a3e25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: I873d0537d902ac0ed9c5b8d6fa03f51e11fbebf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:42:35 +00:00
Joshua Mccloskey
569a8b4073 Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: Ic4fd9c1126a818bb40ef9b33a1e95ec2eafbe35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:42:26 +00:00
Joshua Mccloskey
c665d436d6 Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 7747c3b5dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: Ifd73e88826de5765f1a6e277716966c05d82feb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:42:05 +00:00
TreeHugger Robot
c705beea0d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-01 19:23:59 +00:00
Joshua Mccloskey
7747c3b5dd Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: If6c7958e49bb3b3a7c931ad8cd5a8c8bf0b9dde4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 18:54:44 +00:00
Joshua Mccloskey
3dd64a3e25 Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745

Change-Id: Icd03348aae7c7f2814a4b00244016caaf8f6bbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 18:53:17 +00:00
Joshua Mccloskey
14a5aded8f Merge "Ensure lottie animations are not empty." into tm-dev 2022-06-01 18:02:39 +00:00