Merge branch 'tizen_3.0_dev' into tizen 60/133160/1 accepted/tizen/4.0/unified/20170816.011215 accepted/tizen/4.0/unified/20170816.014627 accepted/tizen/unified/20170629.085415 submit/tizen/20170616.051114 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0_unified/20170814.115522
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Fri, 9 Jun 2017 05:31:48 +0000 (08:31 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Fri, 9 Jun 2017 05:32:49 +0000 (08:32 +0300)
Change-Id: I1e8a4079635a3939f8c08742dbe80d3236d67ae7


Trivial merge