Merge branch 'tizen_3.0_develop' into tizen_3.0
authorminkee.lee <minkee.lee@samsung.com>
Tue, 26 Jan 2016 06:51:57 +0000 (15:51 +0900)
committerminkee.lee <minkee.lee@samsung.com>
Tue, 26 Jan 2016 06:52:29 +0000 (15:52 +0900)
Change-Id: Ia7653174c2e3c06e18dcd49439d8c5cbeb75c6b7
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

Trivial merge