Merge branch 'tizen' into ckm 82/50182/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 26 Oct 2015 14:00:36 +0000 (15:00 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 26 Oct 2015 14:00:50 +0000 (15:00 +0100)
Change-Id: Ie5475e1937fa3035a2c4ba4412583bd0b7badf77


Trivial merge