Merge "Do not use degenerate frames in EGL tests" am: f5971fe17f am: 4a2d8af710 am...
authorMichael Chock <mchock@nvidia.com>
Wed, 16 Aug 2017 20:58:22 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 20:58:22 +0000 (20:58 +0000)
am: fd42356ae3

Change-Id: I25b0df62681a1cfac01017b3fdd4e07c7e05d4a3


Trivial merge