Commit db78674a authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android (Google) Code Review
Browse files

Merge changes I229d25a7,I1bde4c60 into jb-dev 

* changes:
  Fix BasicAdapterTest flakiness
  temporarily nuke RTSP tests until fixed DO NOT MERGE
parents 0dbe8470 bdc0b2c1
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