summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorErik Wolsheimer <ewol@google.com>2016-10-21 17:37:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-21 17:37:05 +0000
commit7d81fa03fa18c3393dbdd18f4b79156a1834b967 (patch)
treeb19cb94f3ad3155027597d8a9834d4de23896dce /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentb2e09827bd0c6b9e339c69dca254ab9d96b37430 (diff)
parent653b982d1877b7a8eb998229c488bd8ebcee2057 (diff)
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
am: 653b982d18 -s ours Change-Id: Icceb19699edb6db18091844d22516eff8ac7bc4d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions