tree e3ac86ffc512eb9c2c91e4809e88c4ed5a546910
parent b9784398e60978d68da3e0e4566a66ed3a2fe297
parent 8f134ea74badba7108989898117bb70c4226b5b5
author Joe Fernandez <joefernandez@google.com> 1313777586 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1313777586 -0700

Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials - Patch1"