am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp

Browse Source

* commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9':
  Support post-decode video rotation.

...

This commit is contained in:

Andreas Huber

2010-11-08 13:14:17 -08:00

committed by Android Git Automerger

parent a4eb4c3a20 2e1a896724

commit db90156350

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available