From: Robin Lee <rgl@google.com>
Date: Tue, 17 May 2016 16:26:07 +0000 (+0000)
Subject: Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev
X-Git-Tag: android-x86-7.1-r1~46
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fsystem-netd.git;a=commitdiff_plain;h=a53b6d9716f3309531b12a459f86f15dbe91a7e9

Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev
am: 5bbe13bdc4

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

Change-Id: I22e4e178b25d579eabde255da1d5b1a6c954556d
---

a53b6d9716f3309531b12a459f86f15dbe91a7e9