Merge "Revert "Revert "Merge prod-tests/src/com/android/media/tests/  from platform/tools/tradefederation to src/com/android/media/tests/ BUG:63819116"""
tree: 8fe6cff7a03dc100b82dd6e5e22e74498d2dc283
  1. res/
  2. src/
  3. .gitignore
  4. Android.mk
  5. MANIFEST.mf
  6. OWNERS
  7. README
  8. README.txt