summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndriy Naborskyy <andriyn@google.com>2016-11-14 14:24:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-14 14:24:29 +0000
commitfd9358530ad2d13cb47bce28564145a9d815373f (patch)
tree5e4aa8ecff4ba4ba9d21cd90ffe2fc97e660affe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent9635303d5fd164e1b5b0de122531bb95fead241e (diff)
parent5c47b5ec064fd94901199c35d67d4e48e9176821 (diff)
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours am: 0a2ac837d1 -s ours am: 415ec85fdb -s ours
am: 5c47b5ec06 -s ours Change-Id: I3a438d3b5945da3fbcb8e6a655e53813d0094b74
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions