| commit | c4024f2153ded2e82ac96c12f2358dde40cd4616 | [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 | 07b86c6aa3f435a78bc923627a47e9ed84eeb5a8 [diff] | |
| parent | 2951fa0233605d4001f8df90070498bcd104cdcb [diff] |
am 659f5ade: Merge "metricsd: Fix race condition in the tests." * commit '659f5ade04a5a07347dfbec9db4ef97636f1ebfe': metricsd: Fix race condition in the tests.