Merge branch 'devel/master' into tizen_4.0 70/155670/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 02:23:45 +0000 (11:23 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 02:23:54 +0000 (11:23 +0900)
commit339c4fcd0375b4f45cae46664b95c75e8eb1ac22
tree0b3a0188bc4f3efede7f0efd81eabae26862d233
parentd4680947920a57608c13d29098d0f5701b4e9b5a
parente7f63e7f5b5d3119bcd512ea30407ff3d8ca5785
Merge branch 'devel/master' into tizen_4.0

Change-Id: I984cd2786a7a7dce687833cac4f719b65d57b53b