Merge "Do not use degenerate frames in EGL tests" am: f5971fe17f
authorMichael Chock <mchock@nvidia.com>
Thu, 24 Aug 2017 18:05:41 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 18:05:41 +0000 (18:05 +0000)
am: 4a2d8af710

Change-Id: I4a2ae433b85d202d52d9e76b3787b0fadc362dc4


Trivial merge