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

author Hyunyoung Song <hyunyoungs@google.com>

Mon, 1 May 2017 23:28:48 +0000 (23:28 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 1 May 2017 23:28:48 +0000 (23:28 +0000)
author Hyunyoung Song <hyunyoungs@google.com>
Mon, 1 May 2017 23:28:48 +0000 (23:28 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 23:28:48 +0000 (23:28 +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	Hyunyoung Song <hyunyoungs@google.com>
	Mon, 1 May 2017 23:28:48 +0000 (23:28 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 1 May 2017 23:28:48 +0000 (23:28 +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