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
tree: 87ba0e44fe1e0c5a7bbe72cc91c5c49a17ba7205
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/