diff options
author | Eric Laurent <elaurent@google.com> | 2014-12-18 21:52:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-18 21:52:48 +0000 |
commit | 0272c12dd7def396d022c6eec80c3b28c544721b (patch) | |
tree | 5311e8d00528de92746e5085055e18a21afbe2b8 | |
parent | bb6cc6b4d5175bb280555b965818ff173a7cd40e (diff) | |
parent | 1ec00eab663c3eb74ad50fc5fc9f6b257f89a524 (diff) | |
download | frameworks_av-0272c12dd7def396d022c6eec80c3b28c544721b.zip frameworks_av-0272c12dd7def396d022c6eec80c3b28c544721b.tar.gz frameworks_av-0272c12dd7def396d022c6eec80c3b28c544721b.tar.bz2 |
am 1ec00eab: (-s ours) Merge "DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown."
* commit '1ec00eab663c3eb74ad50fc5fc9f6b257f89a524':
DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown.
0 files changed, 0 insertions, 0 deletions