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

* commit '6fc1e17b831739eacd630cefe9535e94b3d52e9c':

Change-Id: Iafd3a45642129822ba784cd7b006f469a2a488e4


Trivial merge