OSDN Git Service

am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into...
authorJeff Davidson <jpd@google.com>
Wed, 11 Feb 2015 08:30:44 +0000 (08:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Feb 2015 08:30:44 +0000 (08:30 +0000)
commit46dbb5be4c56e8af603514a3cf2bd7daf0191724
tree2f09b351faed4c4b212fd6903b707f27ceef25a0
parent00c8450d2711de57ee45f66cae1050dbca98d1f5
parent50996a12a8e859346d5eb3c4569c4e81c9b52a05
am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev

* commit '50996a12a8e859346d5eb3c4569c4e81c9b52a05':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.