Merge "Update statsd_config.proto."

author Stefan Lafon <stlafon@google.com>

Sun, 19 Nov 2017 05:04:25 +0000 (05:04 +0000)

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

Sun, 19 Nov 2017 05:04:25 +0000 (05:04 +0000)
author Stefan Lafon <stlafon@google.com>
Sun, 19 Nov 2017 05:04:25 +0000 (05:04 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 19 Nov 2017 05:04:25 +0000 (05:04 +0000)
diff --cc cmds/statsd/src/metrics/DurationMetricProducer.cpp
Simple merge
author	Stefan Lafon <stlafon@google.com>
	Sun, 19 Nov 2017 05:04:25 +0000 (05:04 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 19 Nov 2017 05:04:25 +0000 (05:04 +0000)