Merge "Deprecate ActivityManager#getRunningServices" into oc-dev

author Bryce Lee <brycelee@google.com>

Tue, 18 Apr 2017 14:10:53 +0000 (14:10 +0000)

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

Tue, 18 Apr 2017 14:10:57 +0000 (14:10 +0000)
author Bryce Lee <brycelee@google.com>
Tue, 18 Apr 2017 14:10:53 +0000 (14:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Apr 2017 14:10:57 +0000 (14:10 +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	Bryce Lee <brycelee@google.com>
	Tue, 18 Apr 2017 14:10:53 +0000 (14:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Apr 2017 14:10:57 +0000 (14:10 +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