tree d2f2b10f80b1ae99ca70ffc33d46e6f89f78c16e
parent 7fc646f0bf676a4bc8ae278f70f4eb90c9740fe9
parent 0c11f31b610534754f48b40d0a6ccdd311d43fcf
author Lajos Molnar <lajos@google.com> 1423541968 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423541968 +0000

am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev

* commit '0c11f31b610534754f48b40d0a6ccdd311d43fcf':
  nuplayer: acquire wakelock during offload pause timeout