Merge "updates to use new doc toolchain"
authorChristopher Price <christopher.price@ericsson.com>
Fri, 11 Dec 2015 09:22:46 +0000 (09:22 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 11 Dec 2015 09:22:46 +0000 (09:22 +0000)

Trivial merge