am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
  stagefright amrwbenc: Simplify the definition of static_vo
tree: 1a36262a2c596284f809ab217cc2f33f508fd2f3
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/