summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-05-28 15:45:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 15:45:43 -0700
commitef0c3e269f15200a3a1111ce9f80516b2d38590a (patch)
treee86c90225e5b9db0d1b1b8112ebf6e7e77b06177 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentdcb8d876581f9bf77e51c5539ef68993870264d8 (diff)
parentc8c82009dc8c146efadac6b51702922148f6003f (diff)
am c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master
* commit 'c8c82009dc8c146efadac6b51702922148f6003f': Properly rotate full [-pi, +pi] orientation range if available
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions