Merge remote-tracking branch 'origin/tizen' into yaca 02/84602/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 19 Aug 2016 10:56:31 +0000 (12:56 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 19 Aug 2016 10:56:45 +0000 (12:56 +0200)
Change-Id: Ie127f8356cce6938c6c9b9b9ad5c109db4c79117
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

Trivial merge