am 106cd2b8: Merge "Require conformant configs in EGL tests." into mnc-dev
authorMika Isojärvi <misojarvi@google.com>
Tue, 5 May 2015 19:55:47 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 May 2015 19:55:47 +0000 (19:55 +0000)
* commit '106cd2b898985700c7d5d86c18329a305b04b2a5':
  Require conformant configs in EGL tests.


Trivial merge