OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 637ccf7 33d03a9)
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
authorTony Mak <tonymak@google.com>
Fri, 3 Jun 2016 10:43:37 +0000 (10:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 10:43:37 +0000 (10:43 +0000)
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help