Remi NGUYEN VAN efd24e0f3a Remove extra comment ...

This fixes a merge conflict with downstream branches due to an
incomplete cherry-pick.

Bug: 171540887
Test: m

Merged-In: I0c0daa91ef272a19c548cf55eb2f764c95f8f844
Change-Id: I0ec602f573698578e4d72d38772c39a1b88b87d2

2021-03-18 07:11:48 +00:00

..

aidl-export/android/net

Move OemNetworkPreferences to Connectivity

2021-03-08 09:26:41 +09:00

api

Merge "Change the parameter type from ContentResolver to Context"

2021-03-17 06:35:21 +00:00

src

Merge "Add ConnectivitySettingsManager"

2021-03-17 14:57:32 +00:00

Android.bp

Remove extra comment

2021-03-18 07:11:48 +00:00

jarjar-rules.txt

Add framework-connectivity.impl

2021-03-18 00:29:08 +09:00