Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 05:57:37 +0000 (14:57 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 05:57:41 +0000 (14:57 +0900)
Change-Id: I9edd011239e997cd4ff14f4d5188fd3ff32253b2
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

Trivial merge