Merge "interface for nfc handover supplicant commands"

author Andres Morales <anmorales@google.com>

Wed, 25 Jun 2014 22:23:22 +0000 (22:23 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 25 Jun 2014 17:34:05 +0000 (17:34 +0000)
author Andres Morales <anmorales@google.com>
Wed, 25 Jun 2014 22:23:22 +0000 (22:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 Jun 2014 17:34:05 +0000 (17:34 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Andres Morales <anmorales@google.com>
	Wed, 25 Jun 2014 22:23:22 +0000 (22:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 Jun 2014 17:34:05 +0000 (17:34 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history