Merge branch 'tizen_3.0' into tizen_dev 94/95694/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 4 Nov 2016 08:31:47 +0000 (10:31 +0200)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 4 Nov 2016 08:31:57 +0000 (10:31 +0200)
Change-Id: Ib12cb7317f8869efa233310584acdf89f0774399
Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>

Trivial merge