Merge branch 'tizen' into security-manager 72/50272/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Tue, 27 Oct 2015 09:58:36 +0000 (10:58 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Tue, 27 Oct 2015 10:11:34 +0000 (11:11 +0100)
Change-Id: I9e66326308285f10f2146825918cc37ddcf859f0


Trivial merge