am 106cd2b8: Merge "Require conformant configs in EGL tests." into mnc-dev am: 47ff92fc8b
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:32:34 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:32:34 +0000 (19:32 +0000)
am: 60fd9f98cd

* commit '60fd9f98cdb1489a7c89a26a8ed9e193715acd3b':


Trivial merge