Merge "Use the configs from disk after reboot and separate out ConfigManager startup...

author Howard Ro <yro@google.com>

Fri, 5 Jan 2018 06:44:38 +0000 (06:44 +0000)

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

Fri, 5 Jan 2018 06:44:38 +0000 (06:44 +0000)
author Howard Ro <yro@google.com>
Fri, 5 Jan 2018 06:44:38 +0000 (06:44 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 5 Jan 2018 06:44:38 +0000 (06:44 +0000)
diff --cc cmds/statsd/src/config/ConfigManager.cpp
Simple merge
author	Howard Ro <yro@google.com>
	Fri, 5 Jan 2018 06:44:38 +0000 (06:44 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 5 Jan 2018 06:44:38 +0000 (06:44 +0000)