diff options
author | Chia-chi Yeh <chiachi@android.com> | 2011-07-11 10:29:32 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-11 10:29:32 -0700 |
commit | 839c08876116babbe6302d7e4845f70491bca1e4 (patch) | |
tree | 62a3555429c3caf6d6220df764adf91a9ee9b991 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 94c52b7b90d8ec98592d14e1fe26713eb26fc030 (diff) | |
parent | ebf0d2dd562492fc3c87f4c1676ca0416a83d9cc (diff) |
am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '4821d3bdf8ce35408c6a10fe45c39a5e701ea8e2':
VpnService: stop VPN when unknown DNS servers show up.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions