Merge "[ITC][d2d-conv-manager][ACR-571][Added new module]" into tizen_3.0
authorSohyun Park <so2.park@samsung.com>
Wed, 29 Jun 2016 00:20:32 +0000 (17:20 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 29 Jun 2016 00:20:32 +0000 (17:20 -0700)

Trivial merge