Commit 10b553db authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am a6369cf4: Merge "Fix MediaRandomTest watchdog affecting other tests" into jb-mr1-dev 

* commit 'a6369cf4':
  Fix MediaRandomTest watchdog affecting other tests
parents aabd4ad0 a6369cf4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment