OSDN Git Service

am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time...
authorAndreas Huber <andih@google.com>
Sat, 29 Jan 2011 16:57:21 +0000 (08:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 16:57:21 +0000 (08:57 -0800)
* commit '70888c00a0371692a07132f0dd94208456dd44c1':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.


Trivial merge