Merge "Rationalize API after adding maximum size feature."

author Philip Milne <pmilne@google.com>

Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)

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

Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)
author Philip Milne <pmilne@google.com>
Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)
diff --cc api/current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	Philip Milne <pmilne@google.com>
	Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history