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

* commit 'a176b57bea0ffb169fea0364a030ba83d8a4681f':


Trivial merge