OSDN Git Service

am 248f0d64: am 27c45eb9: (-s ours) am 7ba46433: Merge "Match getLegacyVpn calls...
authorRobin Lee <rgl@google.com>
Thu, 27 Aug 2015 20:16:14 +0000 (20:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:16:14 +0000 (20:16 +0000)
* commit '248f0d640c2d683f456235515544907af0a9f02c':


Trivial merge