OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa21c1b
ed5f337
)
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55
author
Robin Lee
<rgl@google.com>
Wed, 4 May 2016 21:49:45 +0000
(21:49 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 4 May 2016 21:49:45 +0000
(21:49 +0000)
am:
ed5f33740c
* commit '
ed5f33740cf0305cd723f4a5415423bf5fa969c4
':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I3d924e1e8dd69c2392cd09d8c048de7d96b01f40
Trivial merge