Merge in code from gles32-dev
authorPyry Haulos <phaulos@google.com>
Mon, 8 Feb 2016 23:07:48 +0000 (15:07 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 8 Feb 2016 23:08:15 +0000 (15:08 -0800)
commitc5e77317590b46ca50aca15b59225a68d9dd96c6
tree04f84ea5ec21f615f2cf94980bd7793135e2cd96
parent73b2fad7932cd561ee5d47ab748b3e8cfeee6124
parentc877d0c25b8d84134d4d829c922085cf421a138c
Merge in code from gles32-dev

Change-Id: Id3b56b345c8062ca0a79e01f7e2d943dd53672bb