Merge "Statsd broadcast subscriber"

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

Thu, 25 Jan 2018 06:23:36 +0000 (06:23 +0000)

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

Thu, 25 Jan 2018 06:23:36 +0000 (06:23 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 25 Jan 2018 06:23:36 +0000 (06:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 06:23:36 +0000 (06:23 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc cmds/statsd/Android.mk
Simple merge
diff --cc cmds/statsd/src/StatsService.cpp
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 25 Jan 2018 06:23:36 +0000 (06:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 25 Jan 2018 06:23:36 +0000 (06:23 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/statsd/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/statsd/src/StatsService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history