diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-01-25 11:33:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-25 11:33:14 -0800 |
| commit | 01e78a60a44def8edcdbea4c7f85ac5bedec0211 (patch) | |
| tree | 8a4de35215a3e1245706b4ee164471cd5cb6383c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 61bd33968f5df9e67b60ef75e271ad6f4a7702a1 (diff) | |
| parent | 109533519153307b10e2b3ae327ca4b4cd0c75d3 (diff) | |
am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '109533519153307b10e2b3ae327ca4b4cd0c75d3':
Filter our v6 address from tethering dns.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions