Merge branch 'tizen' into tizen_dev 40/93340/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Sun, 23 Oct 2016 07:53:20 +0000 (10:53 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Sun, 23 Oct 2016 07:53:20 +0000 (10:53 +0300)
commit8796e63e35667cfce7289d9d616fa7c9aa72cb73
tree9b32b1e76fd26253295e0f0008127fcbda6908e8
parent3ecc98106371782f9b9b1da5679d4ed2bbef2725
parent490ba354c2f75342f7ce77be9019fabf1aa8a98b
Merge branch 'tizen' into tizen_dev

Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>
Conflicts:
lib-contacts/src/Contacts/List/ListSection.cpp
lib-contacts/src/Contacts/List/ListView.cpp

Change-Id: Iea467f01a8aef0c2c4fc2ea21e53c45ce8279e05
lib-contacts/inc/Contacts/List/ListSection.h
lib-contacts/inc/Contacts/List/ListView.h
lib-contacts/src/Contacts/Groups/MembersListView.cpp
lib-contacts/src/Contacts/List/ListSection.cpp
lib-contacts/src/Contacts/List/ListView.cpp