Merge branch 'tizen_dev' into tizen 32/83532/1 submit/tizen/20160812.062730 submit/tizen/20160812.062754
authorAndrey Klimenko <and.klimenko@samsung.com>
Thu, 11 Aug 2016 11:22:39 +0000 (14:22 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Thu, 11 Aug 2016 11:23:35 +0000 (14:23 +0300)
Change-Id: Ib109f011ba877b6e86efe48ba97ced55014c9c9c
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge