| commit | 19f2b486f698f1ec193409f7b19c947b5484f3dc | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 14:34:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:34:02 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 02cc7c5c0ecb01594a73a97d0e81c1cf61c9584b [diff] | |
| parent | 5c898995022dd73797076fd352b94842ee00c408 [diff] |
am 613c91ae: am acfd2b4b: (-s ours) am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux." * commit '613c91ae932bab8446403df3c9a01dea02bccc1e':