OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f623d6 05e4dc9)
am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneo...
authorChad Brubaker <cbrubaker@google.com>
Fri, 21 Mar 2014 21:16:46 +0000 (21:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 21:16:46 +0000 (21:16 +0000)
* commit '05e4dc96fbe47480fcd639ac679683c90ba07484':
  Fix support for simultaneous VPN tuns


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