Merge branch 'tizen' into cynara 80/88480/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 19 Sep 2016 08:41:16 +0000 (10:41 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 19 Sep 2016 08:48:07 +0000 (10:48 +0200)
Change-Id: I07125f434b1f43940027bd9cc137d7f380f1319b
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

Trivial merge