am 17001cea: NFC: async enabling/disabling, ala Bluewooth & Wifi.

author Brad Fitzpatrick <bradfitz@android.com>

Tue, 19 Oct 2010 17:43:38 +0000 (10:43 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Tue, 19 Oct 2010 17:43:38 +0000 (10:43 -0700)
author Brad Fitzpatrick <bradfitz@android.com>
Tue, 19 Oct 2010 17:43:38 +0000 (10:43 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 19 Oct 2010 17:43:38 +0000 (10:43 -0700)
diff --cc res/values/strings.xml

index d5198e1,2258426..6f94ba7

mode 100644,100755..100644
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
author	Brad Fitzpatrick <bradfitz@android.com>
	Tue, 19 Oct 2010 17:43:38 +0000 (10:43 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 19 Oct 2010 17:43:38 +0000 (10:43 -0700)