Merge "Updated support for drawing background drawable when resizing"

author Wale Ogunwale <ogunwale@google.com>

Fri, 23 Oct 2015 21:48:39 +0000 (21:48 +0000)

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

Fri, 23 Oct 2015 21:48:39 +0000 (21:48 +0000)
author Wale Ogunwale <ogunwale@google.com>
Fri, 23 Oct 2015 21:48:39 +0000 (21:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 23 Oct 2015 21:48:39 +0000 (21:48 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Wale Ogunwale <ogunwale@google.com>
	Fri, 23 Oct 2015 21:48:39 +0000 (21:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 23 Oct 2015 21:48:39 +0000 (21:48 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history