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