| commit | 8e403850cf5514f61e429c88e8d64ffcd8bcd380 | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 11:52:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:52:26 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 86d73f2792d586c37acf777533fc01091b73987b [diff] | |
| parent | 67fadad74498598e8cd5c6475b2a36f9c9020400 [diff] |
am 83399202: (-s ours) am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2." * commit '833992023c18c61078fd68c6c2d6efba27656a8c':