Merge branch 'tizen' into tizen_dev 37/91037/1
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Wed, 5 Oct 2016 10:47:56 +0000 (13:47 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Wed, 5 Oct 2016 10:47:56 +0000 (13:47 +0300)
commit6023fb78ab35fe4bcdc0af1e5725c45b0501dc20
tree619cb97bc5239ed17d47292e34f8a6044f97825a
parentbf703e2859dcb11c6cb27b6f56ded04692ba4b6f
parenta2017f9e4db01e92093d45e27469f8f22e82e6d3
Merge branch 'tizen' into tizen_dev

Conflicts:
edje_src/edc/call_edc/callui-view-lock-screen.edc
edje_src/edc/callui-view-end-call.edc
src/callui-touch-lock-manager.c

Change-Id: Iee3a58211386e8226696017e8fe937c03a9e78d8
17 files changed:
inc/callui-common.h
inc/callui-view-layout.h
inc/callui.h
src/callui-common.c
src/callui-keypad.c
src/callui-state-provider.c
src/callui-touch-lock-manager.c
src/callui-view-callend.c
src/callui-view-dialing.c
src/callui-view-elements.c
src/callui-view-incoming-call.c
src/callui-view-manager.c
src/callui-view-multi-call-conf.c
src/callui-view-multi-call-split.c
src/callui-view-quickpanel.c
src/callui-view-single-call.c
src/callui.c