Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an...

author Dave Burke <daveburke@google.com>

Fri, 19 Oct 2012 04:02:13 +0000 (21:02 -0700)

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

Fri, 19 Oct 2012 04:02:13 +0000 (21:02 -0700)
author Dave Burke <daveburke@google.com>
Fri, 19 Oct 2012 04:02:13 +0000 (21:02 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 19 Oct 2012 04:02:13 +0000 (21:02 -0700)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/view/ViewGroup.java
Simple merge
author	Dave Burke <daveburke@google.com>
	Fri, 19 Oct 2012 04:02:13 +0000 (21:02 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 19 Oct 2012 04:02:13 +0000 (21:02 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/ViewGroup.java	patch \|	diff1 \|	diff2 \|	blob \| history