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

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

Change-Id: Iad42c8621cc2653ebb086806dd50bee41a178e2d


Trivial merge