| commit | 4fc5d758d6722bedf341e5d93a0ba5698c658c29 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Feb 10 04:19:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 10 04:19:01 2015 +0000 |
| tree | 820999bfaf641b43ac8d1118b702e406a6c778b7 | |
| parent | 6d5a063de358312e6d133f8937ffb1b795116129 [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