OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9bf0f7 91f16ac)
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
authorBenjamin Miller <benjaminmiller@google.com>
Fri, 28 Jul 2017 17:30:06 +0000 (17:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Jul 2017 17:30:06 +0000 (17:30 +0000)
am: 91f16ace4f

Change-Id: I93ba6b5f960798344c3abd44caf7db16b1d894a9


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