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

Change-Id: I71fa58f1f6795e105343a714ef337aee262d65ef


Trivial merge