diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-03-21 21:16:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 21:16:46 +0000 |
| commit | 51e938041e72f29c4e776a8627ea9d8a70d62728 (patch) | |
| tree | 939180b0ef6f20e1ffe51731b1231e15b62315c7 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8 (diff) | |
| parent | 05e4dc96fbe47480fcd639ac679683c90ba07484 (diff) | |
am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '05e4dc96fbe47480fcd639ac679683c90ba07484':
Fix support for simultaneous VPN tuns
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions