| commit | 7edf5cb82e16a2db95ebb5a8bd584318088f00b5 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Jun 04 13:22:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 04 13:22:51 2012 -0700 |
| tree | e1b7ebf621a3066ac18da18c15a795eb7b5cde24 | |
| parent | 50307421ca2dd2e587bfefcb60ec5bb72580449c [diff] | |
| parent | efb2d5fd06811aea89aaf2e13764633c09f8465d [diff] |
am efb2d5fd: (-s ours) am db78674a: Merge changes I229d25a7,I1bde4c60 into jb-dev * commit 'efb2d5fd06811aea89aaf2e13764633c09f8465d': Fix BasicAdapterTest flakiness temporarily nuke RTSP tests until fixed DO NOT MERGE