Merge branch 'tizen' into tizen_dev 86/78486/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Tue, 5 Jul 2016 16:01:30 +0000 (19:01 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Tue, 5 Jul 2016 16:01:38 +0000 (19:01 +0300)
commit42fb15f35203502f84fa64f2e93e35bb399508d3
treee9d7191b1280d66c26ce29fd3a97fd30feb66cf6
parentd83298dc92edc71526b5e3e6b467f9e7486420a3
parent8749d8f5ece647b9ed390e682dd3efa56c5f2270
Merge branch 'tizen' into tizen_dev

Change-Id: Id9953e3dff2d6d31dc66dfb85803eff75743f3c7
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
src/Conversation/Main/Controller/src/Conversation.cpp