| commit | d855a738735a3df8863b486f5d3b5e404cef15c1 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Oct 21 13:31:15 2015 -0700 |
| committer | Wei Jia <wjia@google.com> | Wed Oct 21 13:31:15 2015 -0700 |
| tree | cd1434f14e891becd3332fdf29fb499ba060dec3 | |
| parent | c4ac8173f911aeac8d5006b19ba48fb51a865115 [diff] |
NuPlayerRenderer: fix merge error. Change-Id: I9cadabd4b5699a607fd5b22f8bd50f9203542b46