tree 16b625bade315afe03cc5335729020489b254600
parent d4427e5758766b2f3f721b90a6d74a6167872959
parent 413e35ed292e59b62df920e41b1e7cf97fa21964
author David Turner <digit@android.com> 1304452472 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304452472 -0700

am 413e35ed: Merge changes I9226275f,If78e8431,I3e36796d,I90c157df

* commit '413e35ed292e59b62df920e41b1e7cf97fa21964':
  opengl emulator : GLESv2 handling in the test egl implementation
  emulator opengl : unit-test renderer  GLESv2
  emulator opengl: context version param
  emulator opengl - encode glShaderSource