diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-02-18 09:13:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 09:13:00 -0800 |
| commit | df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7 (patch) | |
| tree | 6e65afc56da04b47f40d36909faf291b65f8d343 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | e6d256c50b0709378a5bfff0ae27eb7cf6cc3894 (diff) | |
| parent | 02a64daefece8ccdc40935c7bc865a8966249c44 (diff) | |
am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '02a64daefece8ccdc40935c7bc865a8966249c44':
Tethering: Skip link local addresses when enabling NAT
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions