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