Merge "Make outline and shadow APIs public"

author Chris Craik <ccraik@google.com>

Wed, 19 Feb 2014 18:11:46 +0000 (18:11 +0000)

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

Wed, 19 Feb 2014 18:11:46 +0000 (18:11 +0000)
author Chris Craik <ccraik@google.com>
Wed, 19 Feb 2014 18:11:46 +0000 (18:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 19 Feb 2014 18:11:46 +0000 (18:11 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/view/View.java
Simple merge
author	Chris Craik <ccraik@google.com>
	Wed, 19 Feb 2014 18:11:46 +0000 (18:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 19 Feb 2014 18:11:46 +0000 (18:11 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/view/View.java	patch \|	diff1 \|	diff2 \|	blob \| history