commit | b8a098b28768bb5140ed1a66bd74d0256cd8dc3f | [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 | 70d13b56726fc044aa071bd290c97d88229195b4 | |
parent | 64d2ca5e21efae5c6a227e7e253642c5d51e7073 [diff] | |
parent | 18a64b74aa3cb0babb5f50e5f80660f601d80123 [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