am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '1a864db7723a7947b72d24e6008ba48341d0feff': stagefright aacenc: Simplify the definition of __inline
This commit is contained in:
commit
4bbb0664c0