OSDN Git Service

Merge "Resilent media time stamp adjustment" into gingerbread
authorJames Dong <jdong@google.com>
Mon, 4 Oct 2010 22:35:40 +0000 (15:35 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Oct 2010 22:35:40 +0000 (15:35 -0700)

Trivial merge