| commit | b564b2295353fa68f6e6a18a201e60cbf5325f1e | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Fri Aug 12 16:27:10 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 12 16:27:10 2011 -0700 |
| tree | 2e268a26ccf55480a9d99d20b59f63682b0f7bea | |
| parent | 36c25c084614d72333aeba17e979b43211247311 [diff] | |
| parent | 89116fe61d021dd7479b099860ebf70e18521944 [diff] |
am 89116fe6: am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread * commit '89116fe61d021dd7479b099860ebf70e18521944': MediaPlayer test cleanup + new streaming test placeholder.