Merge branch 'tizen' into tizen_dev 43/78743/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Wed, 6 Jul 2016 14:49:47 +0000 (17:49 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Wed, 6 Jul 2016 14:49:47 +0000 (17:49 +0300)
commitad1418271028d638fe9fd00fd51b669a7dd439a2
treeb1f34ac2bc2cc9eaa34dcb84bdab976d99e0d750
parentc6459042a60c663ad44d5390236cee6eb8a24fb1
parentade1928cf19fcb1dccc0c6a0856156b2b718a7e1
Merge branch 'tizen' into tizen_dev

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

Change-Id: I0275c22d596a3d19f886779d2bed155dadd37c66
lib-contacts/src/Contacts/List/ListView.cpp