OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7bc668 d361964)
am d3619645: am 0b925975: (-s ours) am 48dd8b0f: am 74f99a4e: am 7fb07438: am 674f85a...
authorChad Brubaker <cbrubaker@google.com>
Fri, 14 Mar 2014 10:36:44 +0000 (03:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 10:36:44 +0000 (03:36 -0700)
* commit 'd3619645103a7fc345bd027f5fdd62f771ba9f5b':
  Only allow System apps to make VPN exempt routes


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