Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 12 May 2015 03:37:09 +0000 (12:37 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 12 May 2015 03:37:12 +0000 (12:37 +0900)
Change-Id: I0dbf203367e38c76d1320a74de24760da24e754b


Trivial merge