tree a6f2cfce0544070aa6506551b15b225e4a6dc52b
parent 5745cb1024b615f545871da44260051f384e8c7c
parent 76054d7dba5fde1baff883cdb41e6a22681c4212
author Nicholas Sauer <nicksauer@google.com> 1464623902 +0000
committer android-build-merger <android-build-merger@google.com> 1464623902 +0000

Merge "Set the per test timeout for the AJUR from CoreTestRunner" into nyc-dev
am: 76054d7dba

* commit '76054d7dba5fde1baff883cdb41e6a22681c4212':
  Set the per test timeout for the AJUR from CoreTestRunner

Change-Id: Ib1d9e344a5539d76c478d0adced8cd023b2a13ff