tree 53cf5d0b3f0b3df2b67a340c408a52d45cba5081
parent ea13f6ff99d1304a74f2933f04948a51a8477534
parent 8bd211c79e4cff170a39d225abba71446c2a79ce
author Joe Fernandez <joefernandez@google.com> 1365630006 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365630006 -0700

am 8bd211c7: am 767e8747: am 0b6162e1: am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs

* commit '8bd211c79e4cff170a39d225abba71446c2a79ce':
  docs: OpenGL Dev Guide, fix bug: 6104328