Merge branch 'devel/master' into tizen 62/140462/1 accepted/tizen/4.0/unified/20170816.010318 accepted/tizen/4.0/unified/20170816.014121 accepted/tizen/unified/20170727.191528 submit/tizen/20170725.060315 submit/tizen/20170725.110106 submit/tizen/20170726.063443 submit/tizen/20170727.071110 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0_unified/20170814.115522
authorminho.sun <minho.sun@samsung.com>
Tue, 25 Jul 2017 05:58:11 +0000 (14:58 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 25 Jul 2017 05:58:33 +0000 (14:58 +0900)
Change-Id: I5d41e236d5a03e8930ae36e6bccb4d12f8e73b1e


Trivial merge