am 64d3f44c: am 893cb4da: am 73e17015: Merge change I8d2de438 into eclair

Merge commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5'

* commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5':
  fix [2143798] Need to figure out how to do video