tree e5d3f57c35e1e245ac4e5256568a3a5344384af0
parent d76a71002068556c6be39b3b39ca1dc26714f467
parent 8b5652be729352613bb874cef51c2556b2c00170
author David Turner <digit@android.com> 1312904675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312904675 -0700

am 8b5652be: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"

* commit '8b5652be729352613bb874cef51c2556b2c00170':
  opengles emulator: support glEGLImageTargetRenderbufferStorageOES