| commit | 6ff859ae521d66bba2a58659ff8f9ebaf9dcc514 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Fri Apr 22 01:40:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 22 01:40:59 2016 +0000 |
| tree | 9e422d404263fe6c29f3e7d82412c2cb2e5fa58a | |
| parent | e6baf22d0741ad9e750d6e806d30372d4a124d31 [diff] | |
| parent | 5ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b [diff] |
Merge "NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout" into nyc-dev am: 5ec9c98272 * commit '5ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b': NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout Change-Id: I50965490edba5bcc906516d502a4f90d50f9dfe6