Merge "Video badging levels: @Deprecate and @remove" into oc-dev

author Jeff Sharkey <jsharkey@google.com>

Tue, 2 May 2017 00:44:47 +0000 (00:44 +0000)

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

Tue, 2 May 2017 00:44:51 +0000 (00:44 +0000)
author Jeff Sharkey <jsharkey@google.com>
Tue, 2 May 2017 00:44:47 +0000 (00:44 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 2 May 2017 00:44:51 +0000 (00:44 +0000)
diff --cc api/removed.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/system-removed.txt
Simple merge
diff --cc api/test-removed.txt
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Tue, 2 May 2017 00:44:47 +0000 (00:44 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 2 May 2017 00:44:51 +0000 (00:44 +0000)
		1	2
api/removed.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-removed.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-removed.txt	patch \|	diff1 \|	diff2 \|	blob \| history