Merge "API council review feedback for ActionMenuView" into mnc-dev

author Chris Banes <chrisbanes@google.com>

Thu, 11 Jun 2015 08:05:38 +0000 (08:05 +0000)

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

Thu, 11 Jun 2015 08:05:42 +0000 (08:05 +0000)
author Chris Banes <chrisbanes@google.com>
Thu, 11 Jun 2015 08:05:38 +0000 (08:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 11 Jun 2015 08:05:42 +0000 (08:05 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
diff --cc core/res/res/values/public.xml
Simple merge
author	Chris Banes <chrisbanes@google.com>
	Thu, 11 Jun 2015 08:05:38 +0000 (08:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 11 Jun 2015 08:05:42 +0000 (08:05 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/public.xml	patch \|	diff1 \|	diff2 \|	blob \| history