Merge branch 'tizen' into cynara 80/63580/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Thu, 24 Mar 2016 14:38:15 +0000 (15:38 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Thu, 24 Mar 2016 14:40:13 +0000 (15:40 +0100)
Change-Id: I423b5ba80bd203c9c70a633885c12f2a7efc468b


Trivial merge