Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
tree: 060dc1df2f38a7d1c031af49db48ea58ea4b258f
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/