tree 76a6265c319df75e94b4fd6d8a5d51e194f0ce5f
parent 1c3913cf94572c4bfa2c6f7a98925787c5499b69
parent b408222bd9479c291874b607acae1425d6154fe7
author Andreas Huber <andih@google.com> 1295572499 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295572499 -0800

am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb

* commit 'c4f82e3387429ae94e4874b7dc1649b3c643b505':
  Implement missing pause/resume support for NuPlayer.