| commit | dc74e900d68a799b780759bd03e146af57199d41 | [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 | 56ece709b093aa7570aa2915fa98682113acc5cb [diff] | |
| parent | cd27f8a1980de7af748c22a24efd691f19cae4e2 [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/