summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2017-09-14 00:42:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-14 00:42:13 +0000
commit2124e129c0738c327494ea2395bb0572b02b8226 (patch)
treeae45e07764673c5e6ad416daa5c050131fcb2996 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentd782922e9282d05814d11eff94c23934842460d8 (diff)
parentdd68a88a51d2ddb7d7932b41cfdc2124ddc8a3e5 (diff)
Merge "Do not play sounds when unlocking from AoD." into oc-mr1-dev
am: dd68a88a51 Change-Id: Idd190bc16ed78da0322b3f963be29792c9fe6173
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions