diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-07-12 16:58:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-12 16:58:45 -0700 |
| commit | 15a99db8de19afe3096209717542429535b9b0b0 (patch) | |
| tree | 3261a0523f462502f8b6d8248a43536296ef4ffc /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | db9586b132a833539067cf69fff03356f868e235 (diff) | |
| parent | 839c08876116babbe6302d7e4845f70491bca1e4 (diff) | |
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.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions