Merge "Resilent media time stamp adjustment" into gingerbread
tree: 41cb42b8bd8be0d6c8368c77982786307cba7070
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/