OSDN Git Service

Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
authorJeff Davidson <jpd@google.com>
Wed, 11 Feb 2015 08:25:26 +0000 (08:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Feb 2015 08:25:27 +0000 (08:25 +0000)
commit50996a12a8e859346d5eb3c4569c4e81c9b52a05
treeee718a236ef383ecb3f68cb450b73997195d0800
parentc38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4
parentb21298a686b04d55ff97223dd317497845713f4b
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev