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)
commit07aa0a0fbf2248b6b49c80ba5fc487371ce633ed
tree759a6e3231f350bd8f1828f5b6e76ad1ec110ae8
parenta6d2dc4f7409e7892c8a4df68a8ee9b6d55bb4d4
parent5c4c77f3dab024662af74de919d674ec7209d0db
Merge "Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: bce8cee6fe" into nyc-mr1-dev-plus-aosp
am: 5c4c77f3da

* commit '5c4c77f3dab024662af74de919d674ec7209d0db':

Change-Id: I7661a9f66e6754ad8ef8583652e519bd37568c97