tree 072e93bd35094ab2b2ac20d2d95c467e90d48238
parent 30dce17194d9290ccac8dd1492ba6d9196eead38
parent 0e0638e5448f0fff5d71dacbb528faeda0702350
author David Turner <digit@android.com> 1312904653 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312904653 -0700

am 0e0638e5: Merge "opengles emulator: fix glGetShaderSource"

* commit '0e0638e5448f0fff5d71dacbb528faeda0702350':
  opengles emulator: fix glGetShaderSource