Merge branch 'tizen_2.4' into tizen_2.3
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 10 Apr 2015 03:59:45 +0000 (12:59 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 10 Apr 2015 03:59:47 +0000 (12:59 +0900)
Change-Id: Ibca22ba3194f4a1fb19a6fa83925fcbbb5490f95


Trivial merge