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