Merge "Adds API for apps to push events to statsd."

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

Sat, 16 Dec 2017 00:03:53 +0000 (00:03 +0000)

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

Sat, 16 Dec 2017 00:03:53 +0000 (00:03 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sat, 16 Dec 2017 00:03:53 +0000 (00:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Dec 2017 00:03:53 +0000 (00:03 +0000)
diff --cc Android.bp
Simple merge
diff --cc api/current.txt
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sat, 16 Dec 2017 00:03:53 +0000 (00:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Dec 2017 00:03:53 +0000 (00:03 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history