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 | 109533519153307b10e2b3ae327ca4b4cd0c75d3 (patch) | |
| tree | c9234597634d3c6a52dd76a38779779cd8f35908 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 95306d85005f165e10a25ad45cadadec6e1f6a31 (diff) | |
| parent | 44f64c965776ae65ff85ef8c37afb7e14483bdf2 (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 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions