| commit | c77f096deae89efc75af88ce9883416c67e407d8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:09:57 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:09:57 2012 -0800 |
| tree | 0ecbd0769f339854cca023a8cf56e75f0ba5aa63 | |
| parent | d795296c8db890feda6f623b9e8106a6ca8dd7e4 [diff] | |
| parent | 4bbb0664c0a241375158db3b1c0c1a2f2bf0d4d4 [diff] |
am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" * commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3': stagefright aacenc: Simplify the definition of __inline