commit | a387d5393560cf18e886a76a8a74dbc4b8e99615 | [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 | e02e645cfe555f3e4c417164399c7341596569a0 [diff] | |
parent | c4024f2153ded2e82ac96c12f2358dde40cd4616 [diff] |
am c1799e33: am 659f5ade: Merge "metricsd: Fix race condition in the tests." * commit 'c1799e33c60e84d6f4c0cb0beb0f62b6f87600cf': metricsd: Fix race condition in the tests.