Merge branch 'tizen' into tizen_dev 83/77683/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Thu, 30 Jun 2016 12:40:08 +0000 (15:40 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Thu, 30 Jun 2016 12:40:08 +0000 (15:40 +0300)
commit6464b619e5aa0d51c5962ca130694d5bb5976a5d
tree38619e6a72d06fd6a20627a60595ad7e9bd2d03c
parent4dc3caa2533a64e5466d129cc6944d4b83c3acb6
parente3217e3983402350dad32b0a275fe86d05c281a1
Merge branch 'tizen' into tizen_dev

Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
Conflicts:
src/Conversation/Utils/src/MessageDetailContent.cpp

Change-Id: I161db5abce2cd81cbf3881352586e1249418a60f