Merge branch 'tizen' into ckm 55/69055/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 11 May 2016 08:55:51 +0000 (10:55 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 11 May 2016 08:59:09 +0000 (10:59 +0200)
Change-Id: I2467f6d8e0e5d0d421c20c5880569aa9b93c0365
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

Trivial merge