| commit | c24b47c33d9f250972a570a9ff22920f98d3c732 | [log] [tgz] |
|---|---|---|
| author | Ronghua Wu <ronghuawu@google.com> | Fri Oct 30 16:26:43 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 30 16:26:43 2015 +0000 |
| tree | 803d259a648100269553a731b0233cb34f4d803f | |
| parent | 62ac714617c3c994619afdc0666ac3359d8084e7 [diff] | |
| parent | c5ea4edcd4326eaea78549e3d1ad5e4367e65f06 [diff] |
Merge "nuplayer: don\'t resume if player is reseting" am: c5ea4edcd4 * commit 'c5ea4edcd4326eaea78549e3d1ad5e4367e65f06': nuplayer: don't resume if player is reseting