Merge branch 'tizen_dev' into tizen 07/89607/1 submit/tizen/20160926.072415
authorAndrey Klimenko <and.klimenko@samsung.com>
Mon, 26 Sep 2016 06:40:33 +0000 (09:40 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Mon, 26 Sep 2016 06:41:06 +0000 (09:41 +0300)
Change-Id: I61562286f8846e8ef1abb05c43d74cb6061147db
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge