tree 43089c79fd7acffc6c480a2ce0bbf7f15dcd163a
parent a81f1f6f431d4df758a653c7cf9445a7e77db043
parent 71f07eecababbe5484bbd8e6ea9ef43c018e0534
author James Dong <jdong@google.com> 1285979740 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285979740 -0700

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

Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'

* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
  Turn off media time adjustment by default