tree 87ba0e44fe1e0c5a7bbe72cc91c5c49a17ba7205
parent 555e9dc7439d89846f4d76046d45b628e2d7499e
parent 1fd01cbce6edb54334579f89e49a679207204619
author James Dong <jdong@google.com> 1285979536 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285979536 -0700

am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread

Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp

* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
  Turn off media time adjustment by default