am 1166935c: Merge "Fix program leak in sglrGLContext CreateProgram on build failure...
authorJarkko Pöyry <jpoyry@google.com>
Wed, 10 Dec 2014 03:33:40 +0000 (03:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Dec 2014 03:33:40 +0000 (03:33 +0000)
* commit '1166935ce437c0fe729fa8d8c001dbdecdf106da':
  Fix program leak in sglrGLContext CreateProgram on build failure.


Trivial merge