tree 454c74a200c9b723a2c1cd42f608532561a99e1c
parent 15dea6af2cacd654586acaaf46289f188b98e3d3
parent 4924e58edb9283559302aa1969f2d5823ed0e963
author Jarkko Pöyry <jpoyry@google.com> 1418248584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418248584 +0000

am 4924e58e: am 1166935c: Merge "Fix program leak in sglrGLContext CreateProgram on build failure." into lmp-mr1-dev

* commit '4924e58edb9283559302aa1969f2d5823ed0e963':
  Fix program leak in sglrGLContext CreateProgram on build failure.