summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorVarun Anand <vaanand@google.com>2019-03-22 12:37:54 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-22 12:37:54 -0700
commit16b4163b9deb9b983268ba519942f6febf7c3a75 (patch)
treecc273eb2929978753b30aa2c2917683bab8034ea /rs/java/android/renderscript/RenderScript.java
parentc70a77834ee0297827212a0710281f1342e92cf5 (diff)
parent1b8dfb39828e57d8084e90fb8d5d3c5782486ea5 (diff)
[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev am: ddaa6338c8 -s ours
am: 1b8dfb3982 -s ours am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history Change-Id: Ibe57fcb06756943987e70b7e38e57a07f71de4e6
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions