summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2017-08-12 03:43:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-12 03:43:47 +0000
commit79fa0417628ff1ac97579eaa3bfa9b7665fc2696 (patch)
tree439a6e8727bdfeb8dc3ee495d3aaf8e5f2b2ff1c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent32755985fbddcbb6dc21d676db2912973c60a6f9 (diff)
parent968f7787e0e1c11dfadc9be8dbdddbe108cf7b03 (diff)
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am: 708a1ca16a -s ours" into oc-mr1-dev
am: 968f7787e0 -s ours Change-Id: I933b8597b682a72ee3db82ad08b7f930f813f7fa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions