Merge "Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: bce8cee6...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 2 May 2016 23:19:13 +0000 (23:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 May 2016 23:19:13 +0000 (23:19 +0000)
commit5c4c77f3dab024662af74de919d674ec7209d0db
tree49634f4a4c9ea019bc0df56777944d984fe3fea0
parentc88c61b9bb39ba62fb6553a2d80d8c628ee6392f
parent49de33f80c332df04659f73ddfba68f5137e1f1d
Merge "Revert "Add timeout to eglClientWaitSync() tests." am: ca64481a62 am: bce8cee6fe" into nyc-mr1-dev-plus-aosp