| commit | d93eec665f7c8dbc245bd147c9fcfea4ed11cbca | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 05:20:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:20:29 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 342e637ae25cf4189198d0d49b89ae61763ed0c1 [diff] | |
| parent | 71a1f3c9d1f7d643ae20b1f7a35210813b3fe694 [diff] |
am 71a1f3c9: (-s ours) am 9195d57f: Merge "NuPlayer: set video surface directly when NuPlayer has not started yet." into mnc-dev * commit '71a1f3c9d1f7d643ae20b1f7a35210813b3fe694':