tree 98e43a3d96350f858ad6244d65c060411831593e
parent 2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b
parent 9a0087f22754de40cd5be2a738600f9642a611cc
author Scott Main <smain@google.com> 1375490308 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375490308 -0700

am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs

* commit '9a0087f22754de40cd5be2a738600f9642a611cc':
  docs: OpenGL Training sample code fixes