tree 23ff7e3eac9be501099cc4a260a4b273fc9067a5
parent 8f4f0f43a1a4179d35b2b0012722f77930076920
parent 80f1fee17bee1d24bc2d8cf0b1ad4be6cb3e4215
author Primiano Tucci <primiano@google.com> 1516906923 +0000
committer android-build-merger <android-build-merger@google.com> 1516906923 +0000

Merge "Add perfetto daemons and cmdline client to core makefiles" am: 27be3bf0e2
am: 80f1fee17b

Change-Id: I1794ebfe02e867dd35a03f70fce846a6852e78ec