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

Change-Id: I50897cfd9efe83e8b66cfbb9522cf5d4763feb38


Trivial merge