Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev

author Robin Lee <rgl@google.com>

Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)

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

Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)
author Robin Lee <rgl@google.com>
Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)
diff --cc server/RouteController.cpp
Simple merge
diff --cc tests/binder_test.cpp
Simple merge
author	Robin Lee <rgl@google.com>
	Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)
		1	2
server/RouteController.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/binder_test.cpp	patch \|	diff1 \|	diff2 \|	blob \| history