Merge 'tizen' into tizen_3.0 02/96902/1 submit/tizen_3.0/20161110.134413
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 10 Nov 2016 13:38:43 +0000 (14:38 +0100)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 10 Nov 2016 13:39:07 +0000 (14:39 +0100)
Change-Id: Ie3f88574f5be2c5671c2b5e2817bc36d9528a91d


Trivial merge