Merge branch 'tizen_dev' into tizen 15/88515/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Mon, 19 Sep 2016 11:39:04 +0000 (14:39 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Mon, 19 Sep 2016 11:41:02 +0000 (14:41 +0300)
Change-Id: If2b83024d6fd5831ca671f98115a724c99fcf396
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge