| commit | 0c11f31b610534754f48b40d0a6ccdd311d43fcf | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Feb 10 04:13:46 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 10 04:13:46 2015 +0000 |
| tree | 820999bfaf641b43ac8d1118b702e406a6c778b7 | |
| parent | 0c11001c58526cddc7f6135982f456fff6e34aeb [diff] | |
| parent | 35d5af131c9d4962e935082f204ccd6a2130861c [diff] |
Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev