| commit | dace669c3e39fb13ce284170fdffa3ed0e5ac980 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Mar 20 23:49:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:49:07 2015 +0000 |
| tree | 2f6a1957b35de5e015485eb137b262323634cbc8 | |
| parent | 72f5bd10d089f9bd1bd21c46bf1c5d2053e6f202 [diff] | |
| parent | 3672da6f03db75f7d7c86dd1e994e7758ba82670 [diff] |
am 3672da6f: am 7992a5d0: Merge "NuPlayerDriver: fix current position for stop and pause." into lmp-dev * commit '3672da6f03db75f7d7c86dd1e994e7758ba82670':