Adam Lesinski 39fa40cbad Merge "Disable WiFi energy data collection to avoid deadlock"

2015-03-20 18:07:24 +00:00

..

java

Merge "Disable WiFi energy data collection to avoid deadlock"

2015-03-20 18:07:24 +00:00

jni

DHCP: Add a native method for making a DHCP socket.

2015-03-20 16:32:35 +09:00

res

am d71f548f: am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."

2015-03-19 16:43:52 +00:00

tests

Add two utility methods for IPv4 netmasks.

2015-03-20 16:32:34 +09:00