tree 6a669591201e33d6a516e6eef823e7a5efa0f225
parent 1c4967155109ab083a4149347596f7ebd3662a67
parent 32f3cefa373cd55e63deda36ca9d07c7fe22eaaf
author Andreas Huber <andih@google.com> 1299111061 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1299111061 -0800

Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity."