am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit '0c96e8690408e3cfc12eee521a442c52f1c10b27':
  stagefright aacenc: Fix inline asm constraints
tree: ff61c89a6202ad1ad7244fc8249c436cd660741a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE