Repository files (latest commit first)

Filename	Latest commit message	Latest commit date
Elliott Hughes b89fe38222 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp am: ddd7dd8e7f ... am: 13d5a1d648 * commit '13d5a1d648': Make android_net_NetUtils include what it actually uses. Change-Id: I775c03ba7fd3895c6525d3986b564b228d34063b		2016-05-13 16:08:58 +00:00
..
java/android/net	Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 4c2242b254 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp	2016-05-04 22:04:40 +00:00
jni	resolve merge conflicts of bc90502 to nyc-dev-plus-aosp	2016-05-13 08:57:40 -07:00
tests/coretests	NetworkStats.Bucket API polish.	2016-03-14 11:24:12 -07:00