tree 7c95401caf4acc76a9fd00773c89323cc14f1a5e
parent d9abb30968e6e06e4b3029b24eedc1cf1a3c74d9
parent 5a1237f519169b81e4cf5ab21143506a297b22e1
author David Turner <digit@android.com> 1301528186 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301528186 -0700

am 5a1237f5: am 420e1b0d: am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"

* commit '5a1237f519169b81e4cf5ab21143506a297b22e1':
  Android emulator opengles - unit test gles wrapper