Merge branch 'tizen_dev' into tizen 95/72095/1 submit/tizen/20160530.130930
authorAndrey Klimenko <and.klimenko@samsung.com>
Mon, 30 May 2016 12:27:37 +0000 (15:27 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Mon, 30 May 2016 12:27:44 +0000 (15:27 +0300)
Change-Id: Ibe613f1e190c2fbd4d1a82124b512d98731ec7be
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge