| commit | a887ff9ae61f6cb925feb6e08643716ac28e35db | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:09:57 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:09:57 2012 -0800 |
| tree | b0e18018987ad762d8a0f29ddc506a5ab818b2f1 | |
| parent | f7210cf55cafef55cca8cca65e1749b1dd088e77 [diff] | |
| parent | 4f74be57e72cb2fbee05184f5bc00e716d0b95b3 [diff] |
am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" * commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3': stagefright aacenc: Simplify the definition of __inline