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

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