Merge "[ITC][d2d-conv-manager][ACR-666][Added enums for service API]" into tizen_3.0
authorJihun Park <jihun87.park@samsung.com>
Fri, 1 Jul 2016 01:22:54 +0000 (18:22 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 1 Jul 2016 01:22:54 +0000 (18:22 -0700)

Trivial merge