| commit | 84acd489b93e04bea7aab06d8abb024eef2576fd | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Dec 02 23:31:18 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 02 23:31:18 2013 +0000 |
| tree | 71ac66fba81649361ae864a9b99a696fc9b5d95d | |
| parent | 866d90595a177f6027e97161781948baebf2aa68 [diff] | |
| parent | 7ecfe4ec3f6842377f840513850ad31933bcea30 [diff] |
am 7ecfe4ec: am 92630351: Merge "NuPlayer: Use a software renderer when using software codecs" * commit '7ecfe4ec3f6842377f840513850ad31933bcea30': NuPlayer: Use a software renderer when using software codecs