am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"

* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
  stagefright aacenc: Remove a stray semicolon
tree: 9a104bee310b2ecc44c3bf0aad9ff19e570f876e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/