Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 18 May 2015 04:34:33 +0000 (13:34 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 18 May 2015 04:34:37 +0000 (13:34 +0900)
Change-Id: If9e723ad115c7d715a27d0d94f2172170ac30f16
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

Trivial merge