Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 09:47:51 +0000 (18:47 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 09:48:05 +0000 (18:48 +0900)
Change-Id: I42d4750ecb9d0eaef425d910dd3d95b753c83443


Trivial merge