Merge remote-tracking branch 'tizen.org/tizen' into yaca 26/74826/1
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 15 Jun 2016 15:43:40 +0000 (17:43 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 15 Jun 2016 15:44:54 +0000 (17:44 +0200)
Change-Id: Id96c2fe8192977dc7b02bcfe3b830172bfa7fa41


Trivial merge