tree c3f76b289c2b9e609bc888f4f5f25a8081000111
parent c7b8147e31004549385c86b9a3b133e9b2b25d06
parent 29c43e612cfd23060eea513a13fcded7dd8b4d3e
author Andreas Gampe <agampe@google.com> 1512256216 +0000
committer android-build-merger <android-build-merger@google.com> 1512256216 +0000

Merge "Perfprofd: Fix service definition"
am: 29c43e612c

Change-Id: I0c939cb0db8193bdc58135c993a1bd12808b3085