Merge "Tag brightness APIs with @SystemAPI"

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

Mon, 15 Jan 2018 18:31:34 +0000 (18:31 +0000)

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

Mon, 15 Jan 2018 18:31:34 +0000 (18:31 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 15 Jan 2018 18:31:34 +0000 (18:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 15 Jan 2018 18:31:34 +0000 (18:31 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 15 Jan 2018 18:31:34 +0000 (18:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 15 Jan 2018 18:31:34 +0000 (18:31 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history