Merge "Deeper sanity checking of emitted types."

author Jeff Sharkey <jsharkey@google.com>

Tue, 28 Nov 2017 02:36:17 +0000 (02:36 +0000)

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

Tue, 28 Nov 2017 02:36:17 +0000 (02:36 +0000)
author Jeff Sharkey <jsharkey@google.com>
Tue, 28 Nov 2017 02:36:17 +0000 (02:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 28 Nov 2017 02:36:17 +0000 (02:36 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Tue, 28 Nov 2017 02:36:17 +0000 (02:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 28 Nov 2017 02:36:17 +0000 (02:36 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history