| commit | bcbc31f29d6d0b2ba9dd67f6aeda6c8ca94c8aa6 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Feb 10 04:19:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 10 04:19:28 2015 +0000 |
| tree | d2f2b10f80b1ae99ca70ffc33d46e6f89f78c16e | |
| parent | 7fc646f0bf676a4bc8ae278f70f4eb90c9740fe9 [diff] | |
| parent | 0c11f31b610534754f48b40d0a6ccdd311d43fcf [diff] |
am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev * commit '0c11f31b610534754f48b40d0a6ccdd311d43fcf': nuplayer: acquire wakelock during offload pause timeout