| commit | 836bc215a8593752ed129f01c03950021bf4334c | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Feb 17 15:42:00 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 17 15:42:00 2012 -0800 |
| tree | 8598960c9eb5d2def882463e17052fe7bfa2c314 | |
| parent | 23f8986d92a0dfe0f774afb5a0d5cf2592caec43 [diff] | |
| parent | 1f8528cd5b3012d0f0cd8b04399f019daae94ea2 [diff] |
am 1f8528cd: Merge "MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting" into ics-mr1 * commit '1f8528cd5b3012d0f0cd8b04399f019daae94ea2': MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting