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

Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp

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