Merge "Make number of cpus configurable in dha file"
authorSzilard Cserey <szilard.cserey@gmail.com>
Wed, 9 Mar 2016 17:52:18 +0000 (17:52 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 9 Mar 2016 17:52:19 +0000 (17:52 +0000)

Trivial merge