am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"

* commit 'a887ff9ae61f6cb925feb6e08643716ac28e35db':
  stagefright aacenc: Simplify the definition of __inline
tree: 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE