Merge "Support user-supplied timescales for authoring" into gingerbread
tree: e931f06d00f8a0cca34062866f95ab089910e67e
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/