OSDN Git Service

am dcc4b259: (-s ours) am f180fe31: Merge "Legacy VPN calls to require a userID"...
authorRobin Lee <rgl@google.com>
Thu, 27 Aug 2015 07:06:11 +0000 (07:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:06:11 +0000 (07:06 +0000)
* commit 'dcc4b2597fe61b5745d47dafd8b68fee7b1fa576':


Trivial merge