summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-08-29 23:42:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-29 23:42:04 +0000
commit59927fb5e865c1d4ee1782f27ce6e5d1be6c206f (patch)
treeb67e7c0cf3034c7b2579e9e6bbe4affe44ac780c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent32ccdeae553ef639070c444a034a6a08cb9fe56f (diff)
parent107c06040dd9eafc5fb4f8eaad3b97291d1fd0df (diff)
Merge "Merge "docs: Added reminder that custom CAs aren't automatically trusted by apps." into pi-dev am: 53141c3984 am: 1a96e5c5d3"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions