tree 89c8aadda8820c16888dab970257c730c937a3d1
parent e6874f9df43037b28bb5a8b315849db10d5d1a1e
parent daafd5441af5a180edd20d6edf74a9bd8117a287
author Mathias Agopian <mathias@google.com> 1258062356 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258062356 -0800

am daafd544: am dffa96f7: Merge change I90daccf3 into eclair

Merge commit 'daafd5441af5a180edd20d6edf74a9bd8117a287' into eclair-mr2-plus-aosp

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