| commit | 120b0d715599d5008ec4ab8149373359fe2a8f61 | [log] [tgz] |
|---|---|---|
| author | Samuel Tan <samueltan@google.com> | Thu Sep 24 17:52:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 17:52:44 2015 +0000 |
| tree | f4d535e9cd96be214058d800bc3c87ce756330a5 | |
| parent | f337a1e71c3a5cd7288b849d7432fea29b5bc065 [diff] | |
| parent | 0b9aacd7dd9b68bdcdb229bfbf7a1f6929796b71 [diff] |
am dc74e900: am cd27f8a1: Merge "metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/" * commit 'dc74e900d68a799b780759bd03e146af57199d41': metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/