| commit | 5461e9a3cb812b77292093fa9df1e6caa48bd144 | [log] [tgz] |
|---|---|---|
| author | Samuel Tan <samueltan@google.com> | Thu Sep 24 18:33:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 18:33:47 2015 +0000 |
| tree | 1bf561b7f3b0c3c59b3cae5bd47bf494670c545e | |
| parent | 055b3981a2f6a7b543341ba752a2b46e4b29018a [diff] | |
| parent | 120b0d715599d5008ec4ab8149373359fe2a8f61 [diff] |
am bc86d5d4: am dc74e900: am cd27f8a1: Merge "metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/" * commit 'bc86d5d48ddf7c1dd08bdd89e160c40eb1aa8072': metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/