| commit | c1799e33c60e84d6f4c0cb0beb0f62b6f87600cf | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Tue Sep 29 18:10:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 18:10:56 2015 +0000 |
| tree | 4c2c191096fb484114a6c2a5d2979088ebc62fca | |
| parent | 2a186ba25f72564fb7d70418c8499b547ced55b2 [diff] | |
| parent | 659f5ade04a5a07347dfbec9db4ef97636f1ebfe [diff] |
am 659f5ade: Merge "metricsd: Fix race condition in the tests." * commit '659f5ade04a5a07347dfbec9db4ef97636f1ebfe': metricsd: Fix race condition in the tests.