diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-03-21 20:56:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 20:56:41 +0000 |
| commit | eb3c0d9ac387bb0aea5b4956daac1403253bc76d (patch) | |
| tree | c3efa23f783bdea8b08fd3a079821a396326cd53 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 1fce89d946760a1bcf3a733f55494f963eab00c2 (diff) | |
| parent | 1aad3ad4ec2137c5aa043f96ccc621a4faffeb56 (diff) | |
am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
Fix support for simultaneous VPN tuns
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions