Merge branch 'develop' into tizen_3.0
authorjihye424.kim <jihye424.kim@samsung.com>
Mon, 27 Jun 2016 07:59:21 +0000 (16:59 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Mon, 27 Jun 2016 07:59:45 +0000 (16:59 +0900)
Change-Id: I3cc9c54eb10d7e716f4b2a2773bcb0a2b8bda13e
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge