diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-03-14 16:36:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:36:04 +0000 |
| commit | ff9da494622a7f9358979509849ab94364d17706 (patch) | |
| tree | 1ff890a171f92aeb74f7db6bea75ad76b27024a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 78a06696b714dd97076b98a415aadcc174fe3af0 (diff) | |
| parent | 4b59883afd498dd993263c95aa6db84cbe7c49b4 (diff) | |
am 4b59883a: am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '4b59883afd498dd993263c95aa6db84cbe7c49b4':
Remove SO_BINDTODEVICE from VPN protect
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions