| commit | 4deb606bca47f971f1ca05e44b934c5328cfb6b7 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Aug 20 19:44:54 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 19 02:43:23 2014 +0000 |
| tree | 3f7ada4d416ade35b2f6af54eebf06bd1ad08134 | |
| parent | bb137ef84e6308fb4f977ebf757cf3559e9cce71 [diff] | |
| parent | eb645a0d1820b227af287a5309f017afadbab4e3 [diff] |
Merge "Fix NuPlayer deadlock" into lmp-dev