| commit | d7fe790fe59089394ee01f5d56106c0f488aad0a | [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 | b4a05095970cd2b0b0c19055ac7943fed8ea9e65 | |
| parent | bf9fc69dd171c99794725171c38f65a3c6f6e544 [diff] | |
| parent | 43a1734eba6f409f9982d2e35dde6a869dbbdc90 [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