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