am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588':
  stagefright aacenc: Properly terminate a comment
tree: f51ab2224dac6fd980a461c51fef2e9c0ca10333
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE