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

Change-Id: I86d818ee189deef3102b0f112378cef1723edad0


Trivial merge