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

Change-Id: I51c08c6d1077b49eb145e21c8262ce7ca1569d4a


Trivial merge