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

author Justin Ho <justinho@google.com>

Wed, 17 Oct 2012 22:55:15 +0000 (15:55 -0700)

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

Wed, 17 Oct 2012 22:55:15 +0000 (15:55 -0700)
author Justin Ho <justinho@google.com>
Wed, 17 Oct 2012 22:55:15 +0000 (15:55 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Oct 2012 22:55:15 +0000 (15:55 -0700)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/view/ViewGroup.java
Simple merge
author	Justin Ho <justinho@google.com>
	Wed, 17 Oct 2012 22:55:15 +0000 (15:55 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Oct 2012 22:55:15 +0000 (15:55 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/ViewGroup.java	patch \|	diff1 \|	diff2 \|	blob \| history