OSDN Git Service

Merge "Merge extensions as published at khronos.org"
authorJesse Hall <jessehall@google.com>
Wed, 19 Dec 2012 22:07:09 +0000 (14:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Dec 2012 22:07:09 +0000 (14:07 -0800)

Trivial merge