Merge branch 'develop' 86/126586/1
authorChulwoo Shin <cw1.shin@samsung.com>
Mon, 24 Apr 2017 08:07:36 +0000 (17:07 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Mon, 24 Apr 2017 08:07:50 +0000 (17:07 +0900)
Change-Id: I72a2ae17fa7a9dd76d598d5f31ed9e687e2b60fe
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>

Trivial merge