Merge "Remove @SystemApi from the fields of R.styleable"

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)

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

Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 12 Jan 2018 23:20:58 +0000 (23:20 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history