commit | ec72265fdf9a0a51245d928ae676dc8a5e9c741e | [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 | 0ecbd0769f339854cca023a8cf56e75f0ba5aa63 | |
parent | d2905f09e8edbe82d6bb50111d13349e4e0e9c1d [diff] | |
parent | c77f096deae89efc75af88ce9883416c67e407d8 [diff] |
am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" * commit 'a887ff9ae61f6cb925feb6e08643716ac28e35db': stagefright aacenc: Simplify the definition of __inline