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)
* commit '1a0d1670b4304f294530f4ca9ce68defad6445dc':
  Optionally have SurfaceMediaSource return absolute timestamps


Trivial merge