diff options
| author | Bernie Innocenti <codewiz@google.com> | 2018-07-13 10:49:00 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-13 10:49:00 -0700 |
| commit | c304ce502a699315b5c090a1351a4e85c90dbf3a (patch) | |
| tree | 561e1902b0e992e1efcd4901facb82c01d987087 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 8b06946b223a4baa5102fa406e78972f7c27cf5c (diff) | |
| parent | e4dc066e12bc1ab5fd4f1525503d137ac398c415 (diff) | |
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am: 8f1c70e49b am: d1f53d13a9 -s ours am: 213af1a79e -s ours am: 66bbd64d7d -s ours
am: e4dc066e12 -s ours
Change-Id: Idd1f7eb3d18f9f8fd0601069ec583e64b52e1f10
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions