Merge "support ODT format creation in docs-build.sh"
authorRyota MIBU <r-mibu@cq.jp.nec.com>
Tue, 12 Jan 2016 02:38:55 +0000 (02:38 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 02:38:56 +0000 (02:38 +0000)

Trivial merge