OSDN Git Service

am 2dae2f87: Don\'t vpn dns if the vpn didn\'t provide servers
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 4 Oct 2013 18:59:23 +0000 (11:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Oct 2013 18:59:23 +0000 (11:59 -0700)
* commit '2dae2f8729c3254d5f805ce3df535458db193c12':
  Don't vpn dns if the vpn didn't provide servers


Trivial merge