Merge branch 'tizen' into yaca 28/126428/1
authorDariusz Michaluk <d.michaluk@samsung.com>
Fri, 21 Apr 2017 10:34:59 +0000 (12:34 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Fri, 21 Apr 2017 10:35:13 +0000 (12:35 +0200)
Change-Id: I7517eb4a281375d4fcb0566f2966aac2ca9bc318


Trivial merge