| commit | 5ec9c98272753b9f4cd16d5a9e2d9f4d4b2c164b | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Fri Apr 22 01:32:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 22 01:32:21 2016 +0000 |
| tree | bd5bdc98a1a044b38a6882a51a99e5f4eb432ddd | |
| parent | 17cb0490ffffafc13c47260d51bbcbf2509e1d79 [diff] | |
| parent | 21afe805580c1fdf394415648fba8e1c482def60 [diff] |
Merge "NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout" into nyc-dev