Merge "[ITC][d2d-conv-manager][NONACR][TSAM-5393,TSAM-5651,TSAM-5657,TSAM-5830,TSAM...
authorSohyun Park <so2.park@samsung.com>
Tue, 5 Jul 2016 01:03:40 +0000 (18:03 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 5 Jul 2016 01:03:40 +0000 (18:03 -0700)

Trivial merge