tree 3261a0523f462502f8b6d8248a43536296ef4ffc
parent db9586b132a833539067cf69fff03356f868e235
parent 839c08876116babbe6302d7e4845f70491bca1e4
author Chia-chi Yeh <chiachi@android.com> 1310515125 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310515125 -0700

am 3b219a51: (-s ours) am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE

* commit '3b219a51a9d692807d3fb0f516df81609ca6e4fc':
  VpnService: stop VPN when unknown DNS servers show up.