Merge branch 'tizen_dev' into tizen_3.0 06/95206/1 submit/tizen_3.0/20161102.162709
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Wed, 2 Nov 2016 11:51:19 +0000 (13:51 +0200)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Wed, 2 Nov 2016 11:51:24 +0000 (13:51 +0200)
Change-Id: Ie59a3714c99023746c192eaee7af359c2aebb545
Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>

Trivial merge