Merge branch 'devel/master' into tizen 65/121165/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 07:50:57 +0000 (16:50 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 27 Mar 2017 07:51:14 +0000 (16:51 +0900)
Change-Id: I2c9ab23125b39ee3fbfdd998e34b90a907ab78b5


Trivial merge