Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev

author Lorenzo Colitti <lorenzo@google.com>

Tue, 19 May 2015 10:29:46 +0000 (10:29 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 19 May 2015 10:29:48 +0000 (10:29 +0000)
author Lorenzo Colitti <lorenzo@google.com>
Tue, 19 May 2015 10:29:46 +0000 (10:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 19 May 2015 10:29:48 +0000 (10:29 +0000)
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
author	Lorenzo Colitti <lorenzo@google.com>
	Tue, 19 May 2015 10:29:46 +0000 (10:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 19 May 2015 10:29:48 +0000 (10:29 +0000)