Merge "Add timeout for SCP operations"
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Tue, 28 Jun 2016 11:44:23 +0000 (11:44 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 28 Jun 2016 11:44:23 +0000 (11:44 +0000)

Trivial merge