Merge branch 'tizen' into tizen_dev 15/71415/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Wed, 25 May 2016 09:05:01 +0000 (12:05 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Wed, 25 May 2016 09:05:07 +0000 (12:05 +0300)
Change-Id: Id788b882bec4908cb51f6e6ebf7cde41074ca94a
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge