Merge branch 'develop' 47/105947/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Tue, 20 Dec 2016 06:06:11 +0000 (15:06 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Tue, 20 Dec 2016 06:06:23 +0000 (15:06 +0900)
Change-Id: Id03ac6a12239a2a8c2a41d942acbd7a51834dc7f
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge