Merge branch 'tizen' into yaca 49/88349/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 16 Sep 2016 10:32:00 +0000 (12:32 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 16 Sep 2016 10:32:21 +0000 (12:32 +0200)
Change-Id: Ie7b9804c2f73136dadb45073162ae68fc564f660
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

Trivial merge