Jeff Sharkey 77247f65c3 resolve merge conflicts of afd09db to nyc-mr1-dev-plus-aosp ...

am: 6557b6a

* commit '6557b6af48ac48b8f8069b6b6012659610c6e097':

Change-Id: Iabdfc7e27557677158d6ff107c8e0ad27b1ddcea

2016-04-25 22:52:19 +00:00

core

resolve merge conflicts of d1153a3 to master

2016-04-25 16:40:38 -06:00

services

resolve merge conflicts of d1153a3 to master

2016-04-25 16:40:38 -06:00

tests/CoreTests/android/core

Add support for custom TXT records in NSD

2014-04-14 14:10:36 -07: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%