| commit | 11d4398d1a744c6a6de1eb2a71e287a43f65a881 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Dec 18 22:11:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 18 22:11:05 2014 +0000 |
| tree | 2ead533e43253f9c4df14f634504cca1f711f235 | |
| parent | 70149b79c1ab3ffe9a384f69e607e4e890ff4115 [diff] | |
| parent | 0272c12dd7def396d022c6eec80c3b28c544721b [diff] |
am 0272c12d: (-s ours) am 1ec00eab: (-s ours) Merge "DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown." * commit '0272c12dd7def396d022c6eec80c3b28c544721b': DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown.