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


Trivial merge