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