| commit | db5f7f3596b9fd7399486fc0cdc44d4012f356c6 | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 14:34:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:34:44 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 2e8091d67ed5b91a53f759bdc3fc0dd95b10bef7 [diff] | |
| parent | 8e403850cf5514f61e429c88e8d64ffcd8bcd380 [diff] |
am a814ffe1: am 83399202: (-s ours) am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2." * commit 'a814ffe1b46f59c88fa7f3644c2b332b52a09d2d':