summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorMark Chien <markchien@google.com>2019-03-28 03:31:31 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-28 03:31:31 -0700
commitee10d8bc36dbff7a10200ca047c416539eead994 (patch)
treef8eebeadbabf10e6023f49355f985fd15860523a /rs/java/android/renderscript/RenderScript.java
parent98170a36dd4bf5a40545c000596b60bc7947bfa8 (diff)
parent80a19bfb312d33f4c5515e174cdc899d6a7f01ab (diff)
[automerger skipped] Merge "Only apply entitlement check to cellular upstream" am: eea398a690 am: 068c1bbf8f
am: 80a19bfb31 -s ours am skip reason: change_id Ic2980b4d6864d6f7287816c43eb6cf7a5cdec541 with SHA1 a0d280fc54 is in history Change-Id: Ib112902daba115163fe66daa65694574bb0c2faa
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions