OSDN Git Service

Merge "We're now going to ignore timestamps completely in gtalk video conferencing...
authorAndreas Huber <andih@google.com>
Tue, 10 Aug 2010 19:59:27 +0000 (12:59 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 Aug 2010 19:59:27 +0000 (12:59 -0700)

Trivial merge