2164cf4f4043b4892db5688ed53624af758fcdaa - platform/frameworks/base

commit: 2164cf4f4043b4892db5688ed53624af758fcdaa
[log]
author: Robin Lee <rgl@google.com>
Fri Jul 10 19:21:44 2015 +0000
committer: Android Git Automerger <android-git-automerger@android.com>
Fri Jul 10 19:21:44 2015 +0000
tree: 0a2140c5784447cbebedc4ec3435f14a4f54b2a9
parent: 9320bb082f53dfdf34881907a736527b3bdd9b45 [diff]
parent: f180fe31de4cc428c298a2faed394c417ade5483 [diff]

am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev

* commit 'f180fe31de4cc428c298a2faed394c417ade5483':
  Legacy VPN calls to require a userID

tree: 0a2140c5784447cbebedc4ec3435f14a4f54b2a9