diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-01-25 11:30:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-25 11:30:39 -0800 |
| commit | 424661c12a05755fbac6253119a55d9844b46fe4 (patch) | |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0df964696c240fa0cb8115d64f76f0570507ac70 (diff) | |
| parent | fa00205ed3cce244d5a75369f9d4ec31e09a0455 (diff) | |
am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
Filter our v6 address from tethering dns.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions