tree 904e9ec0e5515afbdf8750be579b3fac244b2b7b
parent f1e1fbc3e234524b34e5f8999ca4143c08857168
parent 97371cc073f1a22cd5d3de494d9d3fe2e0757d5b
author Andreas Gampe <agampe@google.com> 1525976094 -0700
committer android-build-merger <android-build-merger@google.com> 1525976094 -0700

Merge "Perfprofd: Add filegroup for record proto" am: 8fb4b9ace1
am: 97371cc073

Change-Id: I01ee0a7c1eacd93b5950e034b9eda4980c9a559b