tree f518222bda900df363cb6155a67a5aa18b3fc31a
parent 2cd8a6d91614be6eae82c09d227610c0abcd8f23
parent 63e88ce1d4207b6a3fc11b1969a82f7eaeba8e5e
author David Turner <digit@android.com> 1312966445 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312966445 -0700

am 63e88ce1: Merge "opengles emulator: fix initialization of vertex attribute"

* commit '63e88ce1d4207b6a3fc11b1969a82f7eaeba8e5e':
  opengles emulator: fix initialization of vertex attribute