Merge \"Add tests for uniform block linking by binding\" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 21:51:57 +0000 (21:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 21:51:57 +0000 (21:51 +0000)
am: 845104ba90

Change-Id: I6f5a5dc17ad203601bc889e6d74aa66467bae9ba


Trivial merge