am 0272c12d: (-s ours) am 1ec00eab: (-s ours) Merge "DO NOT MERGE - NuPlayer:...
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 '0272c12d':
DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown.