commit | 0b9aacd7dd9b68bdcdb229bfbf7a1f6929796b71 | [log] [tgz] |
---|---|---|
author | Samuel Tan <samueltan@google.com> | Thu Sep 24 17:45:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 17:45:57 2015 +0000 |
tree | 4381227a40f007c49bbbdba4dac9bcd0238b01dd | |
parent | 489a28f54113b214917e5756828630c5acbbce4d [diff] | |
parent | 29ca4377895575a9c8cd87cded9f1e276af2f81a [diff] |
am cd27f8a1: Merge "metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/" * commit 'cd27f8a1980de7af748c22a24efd691f19cae4e2': metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/