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

* commit 'a5aad1b63b3446bb42474f7437e2fdfe6191e5d1':

Change-Id: Ib8c04f8fdd98c04c68517319cfb5b792f22c920d