commit | cf0cd24af5e737047c12642392a642024a85a54b | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Mon Nov 08 13:14:17 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 08 13:14:17 2010 -0800 |
tree | a70022457dcbf54c8116488b7b9df1ad9c22c859 | |
parent | d94206c41dfbac8340b86864d9e05cdc3a3a87ba [diff] | |
parent | 0b12d1460254da6997c577a3acac5a928c6d41a8 [diff] |
am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp * commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9': Support post-decode video rotation.