| commit | 36faa19047d340f1cb7a8e92f3f6c0c9cc3e6a20 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Wed Aug 21 09:51:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 21 09:51:18 2013 -0700 |
| tree | 9128c4b456eaf2aad7b3f52258d08d8de6d79ce4 | |
| parent | ff6057a8e1adad0bf2a0b621784617e8973dad54 [diff] | |
| parent | d049a515354124d1bc56cd036e65330cb5b0640a [diff] |
am d049a515: am 4cd308c6: am 4a852f26: Merge "Fix StreamingMediaPlayerTest" into jb-mr2-dev * commit 'd049a515354124d1bc56cd036e65330cb5b0640a': Fix StreamingMediaPlayerTest