Merge branch 'tizen_dev' into tizen

Change-Id: I2647c8d75d4f5d8f45b561bc3caa5e0407df7bf3
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

diff --cc src/Conversation/AppControl/inc/AttachPanel.h
index 695ec30dfa615a8dfb63287effbf2d27876b53fa,e229e60fb43b1787ce80425a8f5f733da4359ce2..a95138cd8be5f6ee358a5d0107f8480a75780a96
--- 1/src/Conversation/AppControl/inc/AttachPanel.h
--- 2/src/Conversation/AppControl/inc/AttachPanel.h
+++ b/src/Conversation/AppControl/inc/AttachPanel.h
@@@ -39,8 -39,8 +39,9 @@@ namespace Ms
  
              void setListener(IAttachPanelListener *l);
              void show(bool value);
 +            void reset();
              bool isVisible() const;
+             bool isFullExpanded() const;
  
          private:
              AttachPanel(const AttachPanel&) = delete;

diff --cc src/Conversation/AppControl/src/AttachPanel.cpp
Simple merge

diff --cc src/Conversation/Main/Controller/src/Conversation.cpp
Simple merge