Repository files (latest commit first)

Filename	Latest commit message	Latest commit date
Elliott Hughes bdd12ec7b3 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp ... Change-Id: Ic78042d45085718b2220107e9a84767df316440a		2016-05-13 08:57:40 -07:00
..
java/android/net	Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev	2016-05-04 18:38:30 +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