| commit | 157defdde7013062bbd04f7e873b6856adce14ca | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Feb 10 04:33:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 10 04:33:08 2015 +0000 |
| tree | bf6503e41529df950c27f694e256519add85752b | |
| parent | 6d5a1afac2a7bca6b171261ca9b237c3a516e567 [diff] | |
| parent | 4fc5d758d6722bedf341e5d93a0ba5698c658c29 [diff] |
am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout