tree f31c7dc4aee91a4636565427a1ce3d0171bf41b9
parent 84e836590e5fb655c7fd1f49613a4ae9cd2fa963
parent b6114c7b66744729b8e0e9142e8b07eba41637d5
author David 'Digit' Turner <digit@android.com> 1314666056 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314666056 -0700

am b6114c7b: am 7cb797f1: Merge "emulator: opengl: use bilinear filtering"

* commit 'b6114c7b66744729b8e0e9142e8b07eba41637d5':
  emulator: opengl: use bilinear filtering