Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 7 Jan 2015 06:43:32 +0000 (15:43 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 7 Jan 2015 06:43:35 +0000 (15:43 +0900)
Change-Id: I005e064eab713f2ef857ac44b884b0040dc54e28


Trivial merge