Merge branch 'tizen_dev' into tizen 75/64775/1
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Tue, 5 Apr 2016 09:01:40 +0000 (12:01 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Tue, 5 Apr 2016 09:01:40 +0000 (12:01 +0300)
Conflicts:
inc/callui.h

Change-Id: I16110b150d96f52667f1cdbfb3d5f100c32dd515


Trivial merge