Merge branch 'tizen_dev' into tizen 19/88519/1 submit/tizen/20160919.115336
authorAndrey Klimenko <and.klimenko@samsung.com>
Mon, 19 Sep 2016 11:44:02 +0000 (14:44 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Mon, 19 Sep 2016 11:44:16 +0000 (14:44 +0300)
Change-Id: Ica09c9fd8678112a4347775de767f29a33fd493e
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge