Merge branch 'tizen' into yaca 52/96652/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 9 Nov 2016 14:03:25 +0000 (15:03 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 9 Nov 2016 14:07:54 +0000 (15:07 +0100)
Change-Id: I8f39cc854d3eaf1352574f2dd683cdf1e8dd5a1e
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

Trivial merge