Chenbo Feng 86df9aa8f2 Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev ...

am: f33518ff9d  -s ours

Change-Id: Ic39c27bcdf2f117906a9927018036df3c15fd2c5

2017-07-18 19:53:33 +00:00

tests/cts

Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev

2017-06-21 00:41:06 +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%