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

* commit '47ff92fc8b917c399ec2878a0f2750a3e69943bb':


Trivial merge