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

Merge commit '893cb4da1034870a8814394a1c3bdac10ca6cadf' into eclair-mr2-plus-aosp

* commit '893cb4da1034870a8814394a1c3bdac10ca6cadf':
  fix [2143798] Need to figure out how to do video