diff options
author | Chad Brubaker <cbrubaker@google.com> | 2014-03-13 18:12:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 18:12:36 +0000 |
commit | 78f204aed8c0f3c8174616801d66f96a9a00a5fd (patch) | |
tree | fccf2ea9cb330cf705ea043bcda7f89a6f8abf48 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fc1d04714e9042a1b01c7a725fafa1820b8c14fb (diff) | |
parent | 8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac (diff) |
am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
Remove SO_BINDTODEVICE from VPN protect
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions