Merge "Increase timeout and skip test prepare"
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Mon, 9 Oct 2017 06:37:47 +0000 (06:37 +0000)
committerGerrit Code Review <gerrit@automotivelinux.org>
Mon, 9 Oct 2017 06:37:47 +0000 (06:37 +0000)

Trivial merge