merge from tizen branch 95/21295/1
authorwoojin <woojin2.jung@samsung.com>
Sat, 17 May 2014 17:59:13 +0000 (02:59 +0900)
committerwoojin <woojin2.jung@samsung.com>
Sat, 17 May 2014 17:59:13 +0000 (02:59 +0900)
commit072432263026d298bc521f88886acdb27452a01c
treeb22aa1dd5e8571ea775be3c619b79785a7f4fc8b
parent25ce75f40be7f7b5ab8994c6c6e28d1c2b051138
parent229524c48f686e7c0dcbc8df7610dea1ec1071df
merge from tizen branch

Change-Id: Ic0ab29d9c10b7dfae4ba0b398fa71967baf30a77