commit | 43a1734eba6f409f9982d2e35dde6a869dbbdc90 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:07:30 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:07:30 2012 -0800 |
tree | 3bc8e3eabbf105dd255ab478a84308d86e784a6e | |
parent | 30a186e062e6301d54cf3140275fff866237c5fd [diff] | |
parent | 7c7674ea2d7ba099b5afd3badf4d69da55b377dd [diff] |
am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" * commit '1a864db7723a7947b72d24e6008ba48341d0feff': stagefright aacenc: Simplify the definition of __inline