Merge "Increase deqp CTS runner timeout to 10min" into nyc-dev am: 5c55468d55
authorMika Isojarvi <misojarvi@google.com>
Fri, 20 May 2016 17:20:10 +0000 (17:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 May 2016 17:20:10 +0000 (17:20 +0000)
am: a5ef338784

* commit 'a5ef338784992b973b1efec624f1c09c641a2198':
  Increase deqp CTS runner timeout to 10min

Change-Id: I92f2521ca08f5c495c4473555d5c327740288e5d


Trivial merge