summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-09-23 22:25:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-23 22:25:15 +0000
commite055d54715429b0f02c2b306312c778369ceecc6 (patch)
tree3ee7b93daf19b1c8c1297d14ed9b7a6192b5eaf8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent69ed95d1a310e3cdf97712a78995ecbb01377290 (diff)
parent4ffff739478b1fb62711c91a81733e6d9db7d9cc (diff)
Merge "Fix wake lock logic during Dream startup am: 9ede1d2602 am: 042c2349c6" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions