am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread

Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
  Resilent media time stamp adjustment
tree: ebed46062f43630a90c8e8260bbb00a731a2ad54
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/