Merge branch 'tizen' into security-manager 49/63549/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 23 Mar 2016 12:37:25 +0000 (13:37 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Thu, 24 Mar 2016 12:01:00 +0000 (13:01 +0100)
Change-Id: I18dd77f5b98c59cfff3e3d4f943b4c67c29f46e2


Trivial merge