commit | 2e695bfda9031370d15bf0628a9055ddd6946ef8 | [log] [tgz] |
---|---|---|
author | Gaurav Shah <gauravsh@google.com> | Thu Aug 27 14:33:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:33:44 2015 +0000 |
tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
parent | ea769d77b3ce06a95479b6ae1ac9a87fb52768d5 [diff] | |
parent | d36c228f47a829befabb0395f03bc32a7514f38e [diff] |
am a17f8bf7: am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd." * commit 'a17f8bf7f4890a23847d39f02a9bc173b902a94a':