OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9e90a6 4c51dbe)
am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode...
authorSreeram Ramachandran <sreeram@google.com>
Sun, 20 Jul 2014 17:59:41 +0000 (17:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 20 Jul 2014 17:59:41 +0000 (17:59 +0000)
* commit '5e23de196c3ac98e5a0da88515bad5d985d348d9':
  Allow VPN interfaces to be put into blocking mode.


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