Merge "Fix issue #37470038: API Review: ServiceConnection.onBindingDead()" into oc...

author Dianne Hackborn <hackbod@google.com>

Thu, 20 Apr 2017 14:44:48 +0000 (14:44 +0000)

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

Thu, 20 Apr 2017 14:44:48 +0000 (14:44 +0000)
author Dianne Hackborn <hackbod@google.com>
Thu, 20 Apr 2017 14:44:48 +0000 (14:44 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 14:44:48 +0000 (14:44 +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	Dianne Hackborn <hackbod@google.com>
	Thu, 20 Apr 2017 14:44:48 +0000 (14:44 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 20 Apr 2017 14:44:48 +0000 (14:44 +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