tree ac25a5729c7a2137f51d2946fc5c7bc0e22b99bd
parent 2324edf081300b0a588d498667806452e13f21ea
parent ffaee8a4c3d99342445c92254c42160512583180
author Andreas Huber <andih@google.com> 1295635705 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295635705 -0800

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

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