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