| commit | 6ee9b57b06a40e2490911cd390e8528eda0b21c5 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Tue Aug 18 01:31:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 01:31:24 2015 +0000 |
| tree | 4f9e0655f0870cc88645096c47f35fc751b03c0d | |
| parent | 47bfaf57c2fe88b29a1d6e05dfc1fc35e7d08697 [diff] | |
| parent | dd6a17649106fd48b0e69703d339bbc5a1ae9a0b [diff] |
am dd6a1764: am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev * commit 'dd6a17649106fd48b0e69703d339bbc5a1ae9a0b': NuPlayerRenderer: handle error when resuming an offloaded track