am acfd2b4b: (-s ours) am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux."

* commit 'acfd2b4b8bb77f2f5caa27e39b09023079a0196d':
This commit is contained in:
Bertrand Simonnet 2015-08-27 11:52:02 +00:00 committed by Android Git Automerger
commit 613c91ae93

Diff content is not available