commit | 2da1ae856bb3fa6f2b32c634c00c4c496c1b6b2d | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:15:03 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:15:03 2012 -0800 |
tree | a3487a896595852219292e067fa6a3d9f25abed6 | |
parent | 5420ac151624a04a10516902de132596ae8b16a1 [diff] | |
parent | ec72265fdf9a0a51245d928ae676dc8a5e9c741e [diff] |
am 18a64b74: am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" * commit '18a64b74aa3cb0babb5f50e5f80660f601d80123': stagefright aacenc: Simplify the definition of __inline