| commit | 6d91aa1c1d7e4a2b0ead164190599a6e94d4519d | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Feb 17 15:41:57 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 17 15:41:57 2012 -0800 |
| tree | 5738bcc4820b2dc657eff9bbbaaefe4a33a1c70d | |
| parent | a6322b8539e31ee4a2c5356a298ee53d884189ea [diff] | |
| parent | 1f8528cd5b3012d0f0cd8b04399f019daae94ea2 [diff] |
am 1f8528cd: Merge "MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting" into ics-mr1 * commit '1f8528cd5b3012d0f0cd8b04399f019daae94ea2': MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting