OSDN Git Service

Merge "Perfprofd: Fix tests" am: 1261ab9d8d am: a0f59a9dc5
authorAndreas Gampe <agampe@google.com>
Thu, 4 Jan 2018 19:13:38 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Jan 2018 19:13:38 +0000 (19:13 +0000)
am: 0072192791

Change-Id: I4c3fbc54ec6dad0e4f887206674a0ce63cd67a31


Trivial merge