OSDN Git Service

Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev
authorRobin Lee <rgl@google.com>
Tue, 17 May 2016 16:26:07 +0000 (16:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 May 2016 16:26:07 +0000 (16:26 +0000)
am: 5bbe13bdc4

* commit '5bbe13bdc4470d0af2786fc62ad40a8ba8ff5830':
  Drop PROHIBIT_NON_VPN priority 11500 -> 12500

Change-Id: I22e4e178b25d579eabde255da1d5b1a6c954556d


Trivial merge