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: 43089c79fd7acffc6c480a2ce0bbf7f15dcd163a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE