Brian Muramatsu 1fb779d832 Merge remote branch 'goog/honeycomb' into manualmerge ...

Conflicts:
	tools/host/src/com/android/cts/Version.java

Change-Id: I059dc4b100504988ab3b1ccbd0a0bd61c1b05787

2011-06-29 18:13:57 -07:00

tests/cts/net

Merge remote branch 'goog/gingerbread' into manualmerge

2011-06-29 15:58:54 -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%