Andreas Gampe 162ac37980 resolve merge conflicts of 4c35627 to master. ...

Change-Id: I4d8a7ec4a25471565859050939ec05b0c1261627

2014-11-21 14:05:11 -08:00

core

resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp

2014-11-21 10:36:14 -08:00

services

am fb978eb1: am 8a2ac41d: am 29c0c3be: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f

2014-11-21 12:20:00 +00:00

wifi/java/android/net/wifi/p2p

interface for nfc handover supplicant commands

2014-06-16 08:12:47 -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%