summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-23 18:36:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-23 18:36:21 +0000
commitc7a7aa1f17553dfa6ef30934d40215600710ea87 (patch)
tree802d927fbc59fdfbe166aedcc797392af9d9eee1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent4b592938c84888e546757727a64fa10cdf0034c8 (diff)
parent3c8a233cc2c029edeb7f1ac106da468f2dbf15c6 (diff)
Merge "Removing extra haptic feedback. am: 7660bca509 am: 60c32b1f15" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions