Merge "The first step towards adding a guardrail."

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

Wed, 22 Nov 2017 00:01:12 +0000 (00:01 +0000)

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

Wed, 22 Nov 2017 00:01:12 +0000 (00:01 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 22 Nov 2017 00:01:12 +0000 (00:01 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 22 Nov 2017 00:01:12 +0000 (00:01 +0000)
diff --cc cmds/statsd/Android.mk
Simple merge
diff --cc cmds/statsd/src/StatsService.cpp
Simple merge
diff --cc cmds/statsd/src/StatsService.h
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 22 Nov 2017 00:01:12 +0000 (00:01 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 22 Nov 2017 00:01:12 +0000 (00:01 +0000)
		1	2
cmds/statsd/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/statsd/src/StatsService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/statsd/src/StatsService.h	patch \|	diff1 \|	diff2 \|	blob \| history