Merge branch 'develop' 07/125507/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Tue, 18 Apr 2017 01:30:36 +0000 (10:30 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Tue, 18 Apr 2017 01:30:40 +0000 (10:30 +0900)
Change-Id: Ib4269887bd12e0ae55e006564b777ac8031994d4
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge