Merge branch 'develop'. 81/117881/2
authorChangHyun Lee <leechwin.lee@samsung.com>
Wed, 8 Mar 2017 02:19:27 +0000 (11:19 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Wed, 8 Mar 2017 02:20:56 +0000 (11:20 +0900)
Change-Id: I67a4495b9a58456756e2a42f5bde086d657751f4
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge