tree d6e56894d925050e45349420c6a4b6c43ebe0687
parent 58456a0e57d5c40d29660761a4a2ef48a7699395
parent 8103fad7c4f71b9ea7b27f624d7c40153132da2b
author Than McIntosh <thanm@google.com> 1429755477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429755477 +0000

am 8103fad7: Merge "Second round of changes to \'perf\' profile collection daemon."

* commit '8103fad7c4f71b9ea7b27f624d7c40153132da2b':
  Second round of changes to 'perf' profile collection daemon.