commit | 858154e43f7646b767ef4c27af889c741fc5d9c2 | [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 | 67ef9d6740c34095114a56f767cdd4209ae74109 | |
parent | 957eaf4c622937d829188a31d71bf2f8aa378816 [diff] | |
parent | 3baff73198ce852fa60080bd32703028298b4d65 [diff] |
am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp * commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9': Support post-decode video rotation.