Merge latest codes from tizen 2.4 branch
authorKyuho Jo <kyuho.jo@samsung.com>
Thu, 9 Apr 2015 01:19:23 +0000 (10:19 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Thu, 9 Apr 2015 01:19:23 +0000 (10:19 +0900)
Change-Id: I0393a102d3273ea141dc524d5308a1f3a7b69693
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge