Merge branch 'devel/master' into tizen 11/111211/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:34:39 +0000 (11:34 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:34:53 +0000 (11:34 +0900)
Change-Id: I72c14c4b16a6864ef3a6145816dd12dd5dffdc8b


Trivial merge