OSDN Git Service

am 23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
authorDavid Turner <digit@google.com>
Thu, 14 Jan 2010 01:25:42 +0000 (17:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Jan 2010 01:25:42 +0000 (17:25 -0800)
commita84a9656b33c3e90a0747aff26272a7a316bc298
treec5935cf57a2f9e2c077d4b89951641005363c105
parent8315bb4933c49d45f6b080cc8fd46f0bfadeee51
parent23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c
am 23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair

Merge commit '23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c' into eclair-plus-aosp

* commit '23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c':
  Update documentation for OpenGL ES 1.0 / 1.1 / 2.0