| commit | d05dd1813e34b038af5e61b0b0676faa742a45ad | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 21 15:22:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 21 15:22:34 2012 -0700 |
| tree | 59d72bbb30fb93d689eaaca855e7ab63156ac045 | |
| parent | ce725cc1e209658132f7d269f13a9fa1eb7dbe74 [diff] | |
| parent | a48e7ff33231a354f6da5aff04d4b609a6fabe2b [diff] |
am a48e7ff3: am 7bce428c: (-s ours) am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting" * commit 'a48e7ff33231a354f6da5aff04d4b609a6fabe2b': stagefright avcenc: Switch tmp variables to use the right type, to avoid casting