commit | 364ac60cb098f6bbed83c645b142019c38c14321 | [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 | a46976c3df014f3e07aef2ea34da09612cb85381 | |
parent | 1b05438ff3ca49376d4f237ade36aa126fcbd9a1 [diff] | |
parent | 5c2f1220f90ae68a064195ba3c94f1319813f32c [diff] |
am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" * commit '5c2f1220f90ae68a064195ba3c94f1319813f32c': stagefright aacenc: Fix inline asm