tree 3c3f64bce9fa84c2b84082927a245821c3e307de
parent 8498b8681f44ee90dc3138395415fdd0eeecb176
parent fa1bb594cc92e5c9384ed37e9ab0e1f227c50795
author Chia-chi Yeh <chiachi@android.com> 1310405128 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310405128 -0700

Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE