| commit | a17f8bf7f4890a23847d39f02a9bc173b902a94a | [log] [tgz] |
|---|---|---|
| author | Gaurav Shah <gauravsh@google.com> | Thu Aug 27 11:51:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:49 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 1c8e8c883823fbfb9638194aaadb89ed7ae39266 [diff] | |
| parent | 118cd2d95be8ab05aa5914ee8bf9f86e215428f2 [diff] |
am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd." * commit '118cd2d95be8ab05aa5914ee8bf9f86e215428f2':