OSDN Git Service

Merge "Perfprofd: Add IsProfilingEnabled to Config" am: b1dead7b29 am: a361c91030
authorAndreas Gampe <agampe@google.com>
Thu, 28 Dec 2017 23:47:44 +0000 (23:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Dec 2017 23:47:44 +0000 (23:47 +0000)
commit13306d868c47c860705bef7d2cf74f01d4fc7496
tree8f6447308ea682d2b1d1be8813e5df96245e7ed1
parent863f0f14514c9705ada3ba53ff4cb87fb722ce68
parentd80758478c1f6bc970bbcd6e317765f5dc8a5689
Merge "Perfprofd: Add IsProfilingEnabled to Config" am: b1dead7b29 am: a361c91030
am: d80758478c

Change-Id: I6aeea9da75c438b7b6998254ca75781c515e37e3