am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"

* commit '5c2f1220f90ae68a064195ba3c94f1319813f32c':
  stagefright aacenc: Fix inline asm
tree: 89b8397a32c029352abc28a07f3ed150d5d3fc68
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/