tree b6060f7f82aa68a0d0d6dee1969aefdda3216908
parent 7d39e3763ccb0afd2055d3898c04940196cb3b89
parent 7b6498af0c3232c898f4ca3d7345b4af33f7e320
author Andreas Gampe <agampe@google.com> 1515633788 +0000
committer android-build-merger <android-build-merger@google.com> 1515633788 +0000

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

Change-Id: Id88ab7ec345418cacbe622470e54892b807a8d87