OSDN Git Service

am 1042afe6: am e6ad1630: am 305be18d: Merge "Allow make to set a timeout for the...
authorDan Albert <danalbert@google.com>
Sat, 24 Jan 2015 16:58:03 +0000 (16:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 24 Jan 2015 16:58:03 +0000 (16:58 +0000)
* commit '1042afe618c7b2f06d520f9cadc4482124e5c875':
  Allow make to set a timeout for the host tests.


Trivial merge