PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,012 Commits 1 Branch 0 Tags
006d600030058c8e616662b0f711b0ae4e583ad3
Commit Graph

92012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
006d600030 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e am: a3e7bb87d0 am: e8c950cd67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: I2db8911bde40827bdead74a3ec7dd34189027bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 05:23:59 +00:00
Edgar Wang
e8c950cd67 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e am: a3e7bb87d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: Ie2618bd433be0d30c08c3d7785a641cae41cc4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 05:02:34 +00:00
Edgar Wang
a3e7bb87d0 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: I1999c2815380ff902d79e46131f43ece95efad2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 04:40:33 +00:00
Edgar Wang
cc1c6ea62e Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: I878c7c8a4cbccd1660bc4ed7d18d9483fb49c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 04:15:56 +00:00
Edgar Wang
9a206c5870 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: Ie6d6192a880c6f6fa26a4374be7c6281ef70ada9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 03:22:14 +00:00
Edgar Wang
7541d3495f Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: I20b4dbcd149a796e0c56657403d30d6f31d3274c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 03:01:15 +00:00
Edgar Wang
f306a7d1df Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 am: 036905c62a am: 2263cbafcb am: 5eaa6f4a33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: If69ec7450d2823eda740d2540c624899121c91ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:54:08 +00:00
Edgar Wang
0aa8d138f6 Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 am: 0b17e62b6b am: 38ad8f1cdd am: 67e77a940a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: I64240354203356a2e0df248e22a2bb787abc0620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:54:01 +00:00
Edgar Wang
aea669a442 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6 am: 280cf1e018 am: 1489d352b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I70a0cdbe769a1f54ce125324c2f5204be5d7b292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:53:53 +00:00
Edgar Wang
ee78e77aae Fix LaunchAnyWhere in AppRestrictionsFragment am: f600c05a5a am: 52c173bb2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730678

Change-Id: I95f8e4d6928b084544671966889e9bf47883e31e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:53:46 +00:00
Edgar Wang
5eaa6f4a33 Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 am: 036905c62a am: 2263cbafcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: I984d6ee4085f710c4d89a579c1ee9862f8afb429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:49:18 +00:00
Edgar Wang
67e77a940a Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 am: 0b17e62b6b am: 38ad8f1cdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: I63fedbc5c4051476051f63c40de2a334321b8991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:49:11 +00:00
Edgar Wang
2263cbafcb Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 am: 036905c62a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: I968e9a703cd02f07fe017b4c891e961ceb2634ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:49:06 +00:00
Edgar Wang
1489d352b6 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6 am: 280cf1e018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I1df26bd5e0cbb03b6a2dbe1ce17d98fe90e8e91b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:49:05 +00:00
Edgar Wang
38ad8f1cdd Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 am: 0b17e62b6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: Ifb5fea395bee6d0951689f377ea70a7405ef872f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:49:00 +00:00
Edgar Wang
52c173bb2e Fix LaunchAnyWhere in AppRestrictionsFragment am: f600c05a5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730678

Change-Id: I8ed8792698b508aaaf1b019aa7640a04b0ef2ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:48:58 +00:00
Edgar Wang
280cf1e018 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I7f47d79589f9d8c66284fd9a496c0ed64de2f45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:48:55 +00:00
Edgar Wang
036905c62a Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: Iba3eba75524c0e6b64a7c69e38733e844b08e086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:56 +00:00
Edgar Wang
0b17e62b6b Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: Ia021a8974fa666e1aa2b5f87418bd1096473f2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:49 +00:00
Edgar Wang
9562e2e011 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: Ib3c3ca64de6e099b2e2fde18abd35feb3412878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:48 +00:00
Edgar Wang
03d36d79d6 Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: Ice72452717b8ca2edd68a01ba103b33cc7b12fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:40 +00:00
Edgar Wang
52180e031d Fix LaunchAnyWhere in AppRestrictionsFragment am: 019eb77224 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730679

Change-Id: I489e5b8ff03e563cd71cb413c8b24a2cc049c096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 02:47:20 +00:00
Xiao Ma
d60998396a Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3 am: a8ff1f723c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: Ie6ace4dda17b456042295b9104d2ca0246a1ad7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 01:34:45 +00:00
Xiao Ma
a8ff1f723c Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: I9aaf20d105029e379dc8c6c28b3c88d4a75e7424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 01:11:22 +00:00
Xiao Ma
73d83b69d3 Merge "Remove the legacy config_ethernet_iface_regex from Settings." 2022-04-14 00:50:31 +00:00
Xiao Ma
ce9b4447c4 Remove the legacy config_ethernet_iface_regex from Settings. 
Bug: 214348333
Test: m Settings
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
      tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherEnablerTest
Change-Id: I822ff60ee8be63ff0c518d2972ad8b30dfacadcd
 2022-04-13 18:37:26 +09:00
Edgar Wang
019eb77224 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:51:09 +00:00
Edgar Wang
f600c05a5a Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:50:33 +00:00
Edgar Wang
f8f45888e6 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:50:03 +00:00
Edgar Wang
1b9da55a31 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:49:26 +00:00
Edgar Wang
aeb36e5c28 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:48:46 +00:00
Edgar Wang
b3eecdd13d Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
 2022-04-13 04:47:24 +00:00
TreeHugger Robot
f6bc991eca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcf3abb8947dddfdf7db01c7ed7a7a8fb8b95042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:45:50 +00:00
Bill Yi
772b675c21 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2141797b3768ad979ff4dd600687ec17e4b28a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:45:41 +00:00
TreeHugger Robot
6a8dbf49bd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 06:23:57 +00:00
Bill Yi
f89aa3ca1a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21a2962c5ae08b820a33b14a9a2c0243776cf792
 2022-04-09 13:30:52 +00:00
Bill Yi
7df6d79353 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ied5fd9d22e8a7567f921d24c344a6419ccf1fbbe
 2022-04-09 13:15:09 +00:00
Bill Yi
a8dc008745 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic7c984e8829ae72309c1fc673d8b5efda52cac25
 2022-04-09 13:15:01 +00:00
Bill Yi
74fc91b313 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I8ccdc0914ae332731dbc24330bb7d42b05356ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:45 +00:00
Bill Yi
fdcf2eed39 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I24893b4908756aceef98fd3edf3ed0d68e5c27ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:30 +00:00
Bill Yi
6df1ae4e5f [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I50b41ddcca4b5d93a80d7cb274c7bc6aee8e97cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:31:36 +00:00
Bill Yi
ee5c8c915e [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: Iae1f5f9c4b22fdd8aa1e82185a64c07d8c65a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:31:20 +00:00
Bill Yi
c854c108a2 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:25 +00:00
TreeHugger Robot
191b3c66f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cbe6e45fe2c432891eafd33960e2114b602e2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:41:15 +00:00
Bill Yi
6d933dc234 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic87c9242df5d2da4163fe06cdc4a3ef52b271261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:41:03 +00:00
TreeHugger Robot
71308f95e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a5175a3977c16809128da77a7fba4438135952d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:38:33 +00:00
TreeHugger Robot
0e17e61443 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:22:54 +00:00
TreeHugger Robot
dd199c11cb Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 16:20:46 +00:00
TreeHugger Robot
e07b5149fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:20:46 +00:00
Treehugger Robot
a1e66c3aca Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:41:07 +00:00