| commit | aad718b9980ebec4d54ce4dd36ecf3eda5ed80dd | [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 | 0ecbd0769f339854cca023a8cf56e75f0ba5aa63 | |
| parent | a29ae9e97f6dfd67ef92a94786223f63880dba46 [diff] | |
| parent | 39ad1a1f6f636d33005f07128f946fe1ca9fea81 [diff] |
am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" * commit '901b8bb09ffdb0c64c0a8522016ffc1da6358a92': stagefright aacenc: Fix inline asm