Merge "Revert action bar theme attribute"

author Alan Viverette <alanv@google.com>

Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)

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

Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)
author Alan Viverette <alanv@google.com>
Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)
diff --cc core/res/res/values/attrs.xml
Simple merge
diff --cc core/res/res/values/themes_quantum.xml
Simple merge
author	Alan Viverette <alanv@google.com>
	Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 7 Apr 2014 20:22:16 +0000 (20:22 +0000)
		1	2
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/themes_quantum.xml	patch \|	diff1 \|	diff2 \|	blob \| history