tree 229e7ce2c14cbb930d6a28eb4edcb70732ad5a6e
parent 0b66ea65f7c43c7a39e91baf7a39945fc2ad6355
parent dffa96f7349a44a5d587656fce5c55386d44b150
author Mathias Agopian <mathias@google.com> 1258062108 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258062108 -0800

am dffa96f7: Merge change I90daccf3 into eclair

Merge commit 'dffa96f7349a44a5d587656fce5c55386d44b150' into eclair-mr2

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