| commit | 9747d9d0d31e6fbb2afc8ac27724451fa464dec8 | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Tue Sep 29 18:22:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 18:22:36 2015 +0000 |
| tree | 4e25544298e417b80fa7a742caba667e2489175f | |
| parent | 7bf3122dc8e4deb97867aef1bc3475826292b421 [diff] | |
| parent | a387d5393560cf18e886a76a8a74dbc4b8e99615 [diff] |
am 4a014d40: am c1799e33: am 659f5ade: Merge "metricsd: Fix race condition in the tests." * commit '4a014d408d20ce8b592c702fb57ad2a8958bd5a9': metricsd: Fix race condition in the tests.