Merge branch 'devel/master' into tizen 72/120972/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 02:26:48 +0000 (11:26 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 02:27:07 +0000 (11:27 +0900)
Change-Id: I3921da058fc98c712b86120a83a67a52e8a0781b


Trivial merge