OSDN Git Service

am 1a0d1670: Merge "Optionally have SurfaceMediaSource return absolute timestamps...
authorAndreas Huber <andih@google.com>
Mon, 1 Oct 2012 23:45:05 +0000 (16:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Oct 2012 23:45:05 +0000 (16:45 -0700)
commit5db05850d02939e63800ae5b1fcf53a767f2e895
tree91c4dc0e0b1898117ef83793e3095b072e66748e
parentc0256c71182ed9c028e9f5078b64828b8e01f199
parent1a0d1670b4304f294530f4ca9ce68defad6445dc
am 1a0d1670: Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev

* commit '1a0d1670b4304f294530f4ca9ce68defad6445dc':
  Optionally have SurfaceMediaSource return absolute timestamps