Merge branch 'develop' 77/125177/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Fri, 14 Apr 2017 05:06:43 +0000 (14:06 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Fri, 14 Apr 2017 05:06:51 +0000 (14:06 +0900)
Change-Id: I2a0dc385044087a6eba82b3e51c9f5719005fc05
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge