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