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


Trivial merge