Merge branch 'tizen' into security-manager 43/126443/1
authorDariusz Michaluk <d.michaluk@samsung.com>
Fri, 21 Apr 2017 11:21:16 +0000 (13:21 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Fri, 21 Apr 2017 11:22:36 +0000 (13:22 +0200)
Change-Id: I7eaf08fb9052a738be0ed4d584e6eba53fe53f88


Trivial merge