| commit | bb6cc6b4d5175bb280555b965818ff173a7cd40e | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Dec 18 21:52:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 18 21:52:47 2014 +0000 |
| tree | 5311e8d00528de92746e5085055e18a21afbe2b8 | |
| parent | 1c2e3113fa2120b0eb8cb5b7733c816df432f7b5 [diff] | |
| parent | d179bd6779bf0ff5614c5c58de36f989b4b58d04 [diff] |
am d179bd67: (-s ours) Merge "DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed." * commit 'd179bd6779bf0ff5614c5c58de36f989b4b58d04': DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.