diff options
author | Andreas Huber <andih@google.com> | 2010-11-08 13:14:17 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-08 13:14:17 -0800 |
commit | db9015635043effd7aa1811625315dbf2ced5c2a (patch) | |
tree | 0dc834532b6fa63688f258f398417edbc80ad319 /graphics/java/android/renderscript/ProgramFragment.java | |
parent | a4eb4c3a207c4d1b0e72bad332c3e6b928a77738 (diff) | |
parent | 2e1a8967243a88d73f3b3485b07a02aa4f8d16d9 (diff) |
am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
* commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9':
Support post-decode video rotation.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions