tree 180b8fade8e6e28d13670b460e56073e94893fd3
parent be19b0fd5942729e95727ee7e879d7052cfa3ffa
parent 29994cba1a9177f8e113a9aa4ffd68d849c7d216
author David Turner <digit@android.com> 1312966354 -0700
committer Android Code Review <code-review@android.com> 1312966354 -0700

Merge "opengles emulator: make glFramebufferTexture2D work"