| commit | 5c898995022dd73797076fd352b94842ee00c408 | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 11:52:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:52:02 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 4a96f9d50303bf217270bfccd04bb6e678fa6f64 [diff] | |
| parent | 94dbd23486ff5016b8300c5fcfa2e8cbce919841 [diff] |
am acfd2b4b: (-s ours) am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux." * commit 'acfd2b4b8bb77f2f5caa27e39b09023079a0196d':