OSDN Git Service

Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev
authorRobin Lee <rgl@google.com>
Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 May 2016 16:19:40 +0000 (16:19 +0000)
commit5bbe13bdc4470d0af2786fc62ad40a8ba8ff5830
tree5f15c2d0cec942ae77bdaa83abf2ec57abe0df06
parent7ad3c888e2781321cf44cb101cdf180a9671ca1e
parent6c84ef62d953eae93c36ffa831e9b451560afba0
Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev
server/RouteController.cpp
tests/binder_test.cpp