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)

Trivial merge