Merge "Final (hopefully) API cleanup." into honeycomb

author Dianne Hackborn <hackbod@google.com>

Sun, 23 Jan 2011 22:48:09 +0000 (14:48 -0800)

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

Sun, 23 Jan 2011 22:48:09 +0000 (14:48 -0800)
author Dianne Hackborn <hackbod@google.com>
Sun, 23 Jan 2011 22:48:09 +0000 (14:48 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 23 Jan 2011 22:48:09 +0000 (14:48 -0800)
diff --cc api/11.xml
Simple merge
diff --cc api/current.xml
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Sun, 23 Jan 2011 22:48:09 +0000 (14:48 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 23 Jan 2011 22:48:09 +0000 (14:48 -0800)
		1	2
api/11.xml	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.xml	patch \|	diff1 \|	diff2 \|	blob \| history