Merge "First shot at (host-based) card emulation APIs."

author Martijn Coenen <maco@google.com>

Mon, 22 Jul 2013 23:20:01 +0000 (23:20 +0000)

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

Mon, 22 Jul 2013 23:20:01 +0000 (23:20 +0000)
author Martijn Coenen <maco@google.com>
Mon, 22 Jul 2013 23:20:01 +0000 (23:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 22 Jul 2013 23:20:01 +0000 (23:20 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	Martijn Coenen <maco@google.com>
	Mon, 22 Jul 2013 23:20:01 +0000 (23:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 22 Jul 2013 23:20:01 +0000 (23:20 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history