tree 5c0893461869288cb9179d92c3f63b3fbb92b341
parent daba7f34d7d61b36716e1f1d3d13978da76d2101
parent 13bd254f5a1ea985a745e777b4e792883b230c81
author Andreas Gampe <agampe@google.com> 1516129790 +0000
committer android-build-merger <android-build-merger@google.com> 1516129790 +0000

Merge "Perfprofd: Change the imported chrome-base logging" am: 55e15b8b24 am: ec5d5752e0
am: 13bd254f5a

Change-Id: I7d83725d66c7c49e41300431d98d683191afc5c3