am 8ab33df5: am edefaa25: Merge "Ensure we always request conformant OpenGL ES...
am 8ab33df5: am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
* commit '8ab33df5':
Ensure we always request conformant OpenGL ES 2.0 contexts