diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-02-18 17:18:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 17:18:12 +0000 |
| commit | fef3dd01fbad923bf7ff509f4ee95312fd7cb4db (patch) | |
| tree | f571de15b896bd6f8846ab1d1052d06bfe38fe40 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 392ee12fd57870e1e8f0777d03295b0435babd1f (diff) | |
| parent | 41185c844fa7986ff3e5daa4c11288f6bed1463b (diff) | |
am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '41185c844fa7986ff3e5daa4c11288f6bed1463b':
Tethering: Skip link local addresses when enabling NAT
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions