| commit | 8b3f009b9cb78663b6ba9ba0bb25379af0cfc866 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Oct 01 16:45:05 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 01 16:45:05 2012 -0700 |
| tree | 871820d1c79c4f561b267ad6f8604b0535f25950 | |
| parent | a1140f9d984bb4458215e8aa3746af600c16e6de [diff] | |
| parent | 1ba73d32fab532facafa867a3466fbaa763972dd [diff] |
am 1a0d1670: Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev * commit '1a0d1670b4304f294530f4ca9ce68defad6445dc': Optionally have SurfaceMediaSource return absolute timestamps