Merge branch 'devel/master' into tizen 61/132661/1 accepted/tizen/unified/20170608.072244 submit/tizen/20170607.061735
authorminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 03:15:18 +0000 (12:15 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:58:02 +0000 (14:58 +0900)
Change-Id: I8da619e6557a2bdb0f9e9dfd276164d1bf335640


Trivial merge