OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
46a51cb
33d03a9
)
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
author
Tony Mak
<tonymak@google.com>
Fri, 3 Jun 2016 10:43:30 +0000
(10:43 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Jun 2016 10:43:30 +0000
(10:43 +0000)
am:
33d03a9e43
* commit '
33d03a9e435eb474e3bdd3e958943e0057866477
':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: I2de02ec6febdc58ff9a79562059cc11e7d617be5
Trivial merge