tree 1c146e767c7d22502f9af9df0b0778989f225ed4
parent 9c5651390056cd9c2f68d5df057739528bd4128b
parent e29254e708bb94d0f785a00926164a0dbb0dad93
author Android (Google) Code Review <android-gerrit@google.com> 1240519719 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1240519719 -0700

Merge change 462 into donut

* changes:
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.