diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-03-21 21:09:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 21:09:44 +0000 |
| commit | 05e4dc96fbe47480fcd639ac679683c90ba07484 (patch) | |
| tree | b2972244e2e8ee6fa1b9a4d9098e75652a3031de /rs/java/android/renderscript/ProgramStore.java | |
| parent | 9506e84b6f1b8a63abd5c7ecd580548386cc9aae (diff) | |
| parent | 850eb678d7356ea60925dc6fa450e213d5cea2d5 (diff) | |
am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
* commit '850eb678d7356ea60925dc6fa450e213d5cea2d5':
Fix support for simultaneous VPN tuns
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions