summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2016-09-09 10:33:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-09 10:33:40 +0000
commitbd6a29cddcd286020a00f1533a132fa3a119ffbc (patch)
tree5ffd7a59cdbafe13129af4e68e8a8ae672e0bb37 /rs/java/android/renderscript/RenderScript.java
parent8cb6b9335c8dc3367fb7c15f298cc1b648296bda (diff)
parent24ffc9ab47f5f9f2afbec43f05b3423c7b01e37b (diff)
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e
am: 24ffc9ab47 Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions