| commit | 5c2f1220f90ae68a064195ba3c94f1319813f32c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 24 08:57:40 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 08:57:40 2012 -0800 |
| tree | 76cf0c54bca18310a50502d3dc8ca31b1961aecc | |
| parent | 0c96e8690408e3cfc12eee521a442c52f1c10b27 [diff] | |
| parent | 901b8bb09ffdb0c64c0a8522016ffc1da6358a92 [diff] |
am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" * commit '901b8bb09ffdb0c64c0a8522016ffc1da6358a92': stagefright aacenc: Fix inline asm