From: Semun Lee <sm79.lee@samsung.com>
Date: Wed, 3 Jun 2015 02:45:12 +0000 (-0700)
Subject: Merge "add new resource management API" into tizen
X-Git-Tag: submit/tizen/20170725.231500~6^2~118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=864cfb623d9467091502d16b006daa307869ed83;p=platform%2Fcore%2Fapi%2Fapp-event.git

Merge "add new resource management API" into tizen
---

864cfb623d9467091502d16b006daa307869ed83
diff --cc packaging/capi-appfw-application.spec
index a7996e3,2db39e7..2db39e7
mode 100644,100755..100644
--- a/packaging/capi-appfw-application.spec
+++ b/packaging/capi-appfw-application.spec
diff --cc preference/preference.c
index f9751c2,98faf5d..98faf5d
mode 100644,100755..100644
--- a/preference/preference.c
+++ b/preference/preference.c