am 118cd2d9: (-s ours) am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."

* commit '118cd2d95be8ab05aa5914ee8bf9f86e215428f2':
This commit is contained in:
Gaurav Shah 2015-08-27 11:51:49 +00:00 committed by Android Git Automerger
commit a17f8bf7f4

Diff content is not available