| commit | fd0daeb3fd20ba1c0a0fae530ea263e382a811e5 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Jan 17 11:19:49 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 17 11:19:49 2014 -0800 |
| tree | c3086b6fd843643df992471390c686f622154745 | |
| parent | cbf9e91a5ab186904d3dad21eae416c23ee13668 [diff] | |
| parent | 4cc4794029998b21a1689794cd5bcbd5e4480ef6 [diff] |
am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print" * commit '4cc4794029998b21a1689794cd5bcbd5e4480ef6': Fix compile error in NuPlayerRenderer debug print