TreeHugger Robot 90a2635232 [automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a51d am: 69292a8890 -s ours ...

am skip reason: Merged-In I1de322c95aacc8924e95bcdbcfdbd1ec441de99c with SHA-1 f1ea9b302c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: Iadbeb14337aacf8edb419ffb03f66b636c489b04

2021-05-22 05:30:37 +00:00

framework

Merge "Check location permission for ConnDiags last." am: c5f9939bf3 am: 7cc1a8b2e7

2021-05-20 22:18:05 +00:00

service

Merge "Use CS identity to update setting while performing factory reset" am: 049dbc5697 am: ab42076b53

2021-05-21 02:08:51 +00:00

tests

Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 5cb9e37a55 am: 10f4456e79

2021-05-21 23:12:45 +00:00

OWNERS

Add OWNERS block for migration

2021-05-21 16:33:32 +00:00

TEST_MAPPING

Add TEST_MAPPING for Connectivity

2021-03-19 16:03:14 +00:00

Description

android_packages_modules_Connectivity

189 MiB

Languages

Java 81.4%

Kotlin 7.7%

AIDL 4.5%

C++ 4.5%

C 1.7%

Other 0.1%