Paul Hu 9d73b70404 resolve merge conflicts of 82227141f6 to sc-dev ...

Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: Idd5d75e0e9a7ad4f840b88da55d28fbaa2275dd0

2021-03-18 14:50:05 +00:00

..

aidl-export/android/net

Move OemNetworkPreferences to Connectivity

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

api

Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: bf97a3ab5e am: ba22df4f9d am: 2d82b40262

2021-03-17 22:13:06 +00:00

src

resolve merge conflicts of 82227141f6 to sc-dev

2021-03-18 14:50:05 +00:00

Android.bp

Add connectivity protos to framework-connectivity

2021-03-18 08:07:20 +00:00

jarjar-rules-proto.txt

Add connectivity protos to framework-connectivity

2021-03-18 08:07:20 +00:00

jarjar-rules.txt

Add connectivity protos to framework-connectivity

2021-03-18 08:07:20 +00:00