tree dd68f5598657e0cd7ca73e87e98f299e2d50aef1
parent 787893d248a19f49a8e29c67f45081f3b6870c2c
parent 74d365c2563e999fc7566ac91293537b3e8efa9d
author Bertrand Simonnet <bsimonnet@google.com> 1439319886 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439319886 +0000

am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux."

* commit 'e6a1dff215370491d0f683e323841a7c177ee4eb':
  metricsd: Only define the targets on linux.