merge some local changes
authorSechang Sohn <sc.sohn@samsung.com>
Tue, 3 Sep 2013 23:57:24 +0000 (08:57 +0900)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 12 Sep 2013 04:55:26 +0000 (21:55 -0700)
commit4ab252e43392e2a0ee9cabf91b2cb09a276325c5
tree30c0c608b2ce99418af8c6a164a24f84f2e87cec
parentc40df9b91a16c2269884fbf626e96f330d1162c4
merge some local changes

- Fix more change for delaying nfc activation
- bug fix(g_object_ref to g_variant_ref)
- keep_SE_select_value
- Modify the boot-sequence of the nfc-manager-daemon

Change-Id: Ib7b98e959b602c67993df19c32dae1692c9f9c90
client/net_nfc_client_manager.c
client/net_nfc_client_snep.c
daemon/net_nfc_server_llcp.c
daemon/net_nfc_server_manager.c
daemon/net_nfc_server_se.c
packaging/nfc-manager.service
packaging/nfc-manager.spec