am 4f402882: Merge "Remove uniform block tests using double underscore." into mnc...
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:35:20 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:35:20 +0000 (19:35 +0000)
am: a3c4e2124d

* commit 'a3c4e2124dc9094b02b145d7d9bfe29e962e78e1':


Trivial merge