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)
am: a5aad1b63b

* commit 'a5aad1b63b3446bb42474f7437e2fdfe6191e5d1':

Change-Id: Ib8c04f8fdd98c04c68517319cfb5b792f22c920d


Trivial merge