Merge branch 'tizen_dev' into tizen 37/90537/1 submit/tizen/20160930.111753
authorAndrey Klimenko <and.klimenko@samsung.com>
Fri, 30 Sep 2016 11:06:31 +0000 (14:06 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Fri, 30 Sep 2016 11:06:38 +0000 (14:06 +0300)
Change-Id: Iecdce257efa4d2b084d6cd2de971bcee38ef50b4
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge