summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-03-14 04:12:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 04:12:08 +0000
commitd8b170799f1cb00825a4a947901d4b214d20c5a1 (patch)
treef696b2737bfce04a5dc89b9286c7159ba97e3f81 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent6cde6c75b3469b7f76343ef7fc646f65c8393a17 (diff)
parent6ae4d53b571cb71cc6c2ad55d12679d22e9334d5 (diff)
am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev
* commit '6ae4d53b571cb71cc6c2ad55d12679d22e9334d5': Fix power manager display wake lock bugs. (DO NOT MERGE)
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions