Merge "Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: bce8cee6...
authorMika Isojärvi <misojarvi@google.com>
Mon, 2 May 2016 23:24:53 +0000 (23:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 23:24:53 +0000 (23:24 +0000)
am: 5c4c77f3da

* commit '5c4c77f3dab024662af74de919d674ec7209d0db':

Change-Id: I7661a9f66e6754ad8ef8583652e519bd37568c97


Trivial merge