Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev

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

Mon, 1 May 2017 23:18:37 +0000 (23:18 +0000)

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

Mon, 1 May 2017 23:18:41 +0000 (23:18 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 1 May 2017 23:18:37 +0000 (23:18 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 1 May 2017 23:18:41 +0000 (23:18 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 1 May 2017 23:18:37 +0000 (23:18 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 1 May 2017 23:18:41 +0000 (23:18 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history