| commit | b76e45bd85b5275efc9c440437a43b935f847e9d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 24 09:12:17 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 09:12:17 2012 -0800 |
| tree | ff61c89a6202ad1ad7244fc8249c436cd660741a | |
| parent | d48dfdaaedb8c5973024c05df27fdc0f57cd1d4a [diff] | |
| parent | aad718b9980ebec4d54ce4dd36ecf3eda5ed80dd [diff] |
am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" * commit '5c2f1220f90ae68a064195ba3c94f1319813f32c': stagefright aacenc: Fix inline asm