Merge branch 'devel/master' into tizen 22/127822/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:03:11 +0000 (11:03 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:03:18 +0000 (11:03 +0900)
Change-Id: Id974a7516eae1395af2db4c247180f90f4d1ac41


Trivial merge