summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-06-18 15:48:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-18 15:48:28 +0000
commit7aa8c5e05f297f789e46eaf116e395ab943aeecb (patch)
treeb5f38a9a0864bb43a61b5903118b0450021bba89 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parente0a73aa41182f4766f75246fbc4863735524df6c (diff)
parentdc13c1ce504d174eb969cf9b342cbde5ec94163f (diff)
Merge "[automerger skipped] Merge "Remove unnecessary usage of deprecated Time class" am: 39b253ff6c am: c80913eea8 -s ours am: 6a09b2d590 -s ours am: e74a6b06ce -s ours am skip reason: change_id I8221a4303b075afe8e8243863915313e4a81b6e4 with SHA1 d5f0a399f2 is in history"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions