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

* commit '0a99b062dc09224dcf8deb17916f568557296e06':


Trivial merge