tree 0f9bcedbb904ec388b1a11104496890e9969fca0
parent 5e123b56431322502f52ea8ca93fd0f976d7c928
parent 4ec8f972195e9d3243695c7dc4d248b80f27c4d1
author Andreas Gampe <agampe@google.com> 1527203056 -0700
committer android-build-merger <android-build-merger@google.com> 1527203056 -0700

Merge "Perfprofd: Refactor ConfigReader" am: 763bfc6188
am: 4ec8f97219

Change-Id: I2b7c1a05bc2555f102fb908debd40a77cacac5a7