am 2c694f03: am daafd544: am dffa96f7: Merge change I90daccf3 into eclair

Merge commit '2c694f032c1bea7003098336b32861e7b97aa9c7'

* commit '2c694f032c1bea7003098336b32861e7b97aa9c7':
  fix [2143798] Need to figure out how to do video on Passion w/ GPU