From: KyungwooNoh <kw1004.noh@samsung.com>
Date: Wed, 2 Oct 2013 02:17:49 +0000 (+0900)
Subject: Merge branch 'tizen_2.2' into tizen
X-Git-Tag: submit/tizen/20131002.044811^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93974ec6cbdf65e867ac41921ff0faae341040c5;p=platform%2Fcore%2Fapi%2Fapplication.git

Merge branch 'tizen_2.2' into tizen

Conflicts:
	packaging/capi-appfw-application.spec

Change-Id: I408f808cc3951d23f6888f0dc858595f9fa8e568
Signed-off-by: KyungwooNoh <kw1004.noh@samsung.com>
---

93974ec6cbdf65e867ac41921ff0faae341040c5