OSDN Git Service

Merge "Manually fix GLES headers" into nyc-dev
authorPablo Ceballos <pceballos@google.com>
Thu, 24 Mar 2016 20:21:19 +0000 (20:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Mar 2016 20:21:19 +0000 (20:21 +0000)

Trivial merge