tree b7ea368e072c0d3cf5c58b89960b2a10ed914767
parent 5fa6a23716f10db1bfbdf57ebedc2e47d7365d5f
parent 96e5a7123a9a0737aed83412d8cf06ad171d7d5d
author Andreas Gampe <agampe@google.com> 1515633942 +0000
committer android-build-merger <android-build-merger@google.com> 1515633942 +0000

Merge "Perfprofd: Move binder code into subdirectory" am: 5d9d50dd2a am: 7b6498af0c
am: 96e5a7123a

Change-Id: I7b18d4b96df7ac86504da642ea96075f88c37f5c