Merge branch 'tizen_dev' into tizen 05/85705/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 26 Aug 2016 14:31:17 +0000 (17:31 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 26 Aug 2016 14:31:23 +0000 (17:31 +0300)
commit74e8ce14f8b852967b18329d57190772babd363b
treedd42473f1d9f92f6dc0655a479a3de2601dcc525
parentb6748de790799e1507236e6269debf1a129190fb
parent8ba0a0cd2b33e754c0f133f559a05bdec3fcde1f
Merge branch 'tizen_dev' into tizen

Change-Id: I910c4615ba7dffb33a9af766302a3e446f69f531
main-app/src/edit/CalEditView.cpp