Merge branch 'tizen' into tizen_dev 62/84062/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Tue, 16 Aug 2016 10:46:22 +0000 (13:46 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Tue, 16 Aug 2016 10:46:34 +0000 (13:46 +0300)
commit27f4e9948fd36b41c21d922f0d96c292f6a8f39e
tree11084f6d9fcd11a8bdd2c028f055f1801930a09b
parent224a93f21db1d90ad3998e726ceab9631a3207c6
parent8a0d6d2b289491926112750b2c7a17fc0e9222e0
Merge branch 'tizen' into tizen_dev

Change-Id: I5deecde8d1044792fbf8021c5ce74d692d1e217a
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
src/common-efl.c
src/notification-setting-info.c