Merge 'tizen' into tizen_3.0 accepted/tizen/3.0/mobile/20161115.022526 submit/tizen_3.0/20161113.163824
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Sun, 13 Nov 2016 16:37:36 +0000 (17:37 +0100)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Sun, 13 Nov 2016 16:37:36 +0000 (17:37 +0100)

Trivial merge