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