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:
bc53086
5934ae6
)
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev...
author
Benjamin Miller
<benjaminmiller@google.com>
Fri, 28 Jul 2017 21:15:41 +0000
(21:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 28 Jul 2017 21:15:41 +0000
(21:15 +0000)
am:
5934ae605a
Change-Id: Ia4c07afe64fd3a0a743790f1e1284bdc1db0f4c5
Trivial merge