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-05-21 17:59:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-21 17:59:08 +0000
commit206cd24862468837feec3eb8e9997748fbeff213 (patch)
treef36bd94fc88f1c0636211fb0985f816f6b08e4aa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent580417a3f5039cd3a7a7ff12734ae5aef8a4c1d5 (diff)
parent5d619ef1d3f603068d3e6c1c2b6664196b20e855 (diff)
Merge "[automerger skipped] Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" into qt-dev am: f413c1e833 am: a04806c068 -s ours am skip reason: change_id I9a974018d4155426b1050a4b80b82f4bf4a9d996 with SHA1 7bc3d98515 is in history" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions