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

Change-Id: Ia1dcb275ef44e6eae61033b59d50286d99d5b8bb


Trivial merge