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

* commit 'e0540ad46951a2ef4bc53f37ff9921fdfc6c8f56':


Trivial merge