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

Change-Id: I659eb59a332af92c90de471a3cdb6eb2ce9ec4d2


Trivial merge