Chenbo Feng 3d166665b1 Resolve merge conflicts of 2ce31b513f to nyc-dev ...

Merged-In: Ie9ed8aa604be7c6ae364baa69922b89c006dea72

Test: I solemnly swear I tested this conflict resolution.

Bug: 62489688

2017-07-17 22:34:13 +00:00

tests/cts

Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev

2017-07-17 21:09:29 +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%