commit | 18a64b74aa3cb0babb5f50e5f80660f601d80123 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:12:32 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:12:32 2012 -0800 |
tree | 05a37e8e8cdab2c75e593773ecaba0689694f52c | |
parent | 6b4d7bada0b1d34f93149211cb179b71c864d5d3 [diff] | |
parent | a887ff9ae61f6cb925feb6e08643716ac28e35db [diff] |
am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" * commit 'a887ff9ae61f6cb925feb6e08643716ac28e35db': stagefright aacenc: Simplify the definition of __inline