tree aac92f4aa0aadc058321396aebddeab091686b96
parent 3473e814a4a7efdc7e9842d0659825e741b502d0
parent f589dd2915587994d3dd36eff2191962fe0b71c0
author Mathias Agopian <mathias@google.com> 1379701198 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379701198 -0700

am f589dd29: am e2a3e872: Merge "Fix GLES context version selection" into klp-dev

* commit 'f589dd2915587994d3dd36eff2191962fe0b71c0':
  Fix GLES context version selection