Merge "Fix error recovery in Stagefright init."
tree: 0c7c0d4c4e3a65f83fd44fbfbe825d927676d6c6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/