Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 09:45:57 +0000 (18:45 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 09:46:13 +0000 (18:46 +0900)
Change-Id: I2d0c782bb0cae0f70fbc0d1d0d5afb8d19b3339c


Trivial merge