Merge remote-tracking branch 'origin/tizen' into cynara 95/84595/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 19 Aug 2016 10:37:00 +0000 (12:37 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Fri, 19 Aug 2016 10:41:03 +0000 (12:41 +0200)
Change-Id: I27fd4ae639e50120ce21acf26220c8fb2c8a513b
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>

Trivial merge