OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f0e93d 46dbb5b)
am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into...
authorJeff Davidson <jpd@google.com>
Wed, 11 Feb 2015 08:38:35 +0000 (08:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Feb 2015 08:38:35 +0000 (08:38 +0000)
automerge: 46dbb5b

* commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.


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