tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent 5cfc0b29db11d6f71d122ef155c3869a52203463
parent c4c313f8ca2f65420b16eedd878ec26047a7bd6e
author Joe Fernandez <joefernandez@google.com> 1328824126 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328824126 -0800

am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)