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
tree: a3487a896595852219292e067fa6a3d9f25abed6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE