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

* commit 'ec0c94b7d70c1e4160e1ec57070b94d052de7eb5':
  Implement missing pause/resume support for NuPlayer.
tree: ac25a5729c7a2137f51d2946fc5c7bc0e22b99bd
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/