| commit | cff393f18f2c7017de8def6292a8cc125b616427 | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 11:54:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:28 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 268bdb9d82a7ae6d3ad762332427bd37b07f7a99 [diff] | |
| parent | 891f33c8de215ac9c252c322ee08fad9581c1459 [diff] |
am 60413943: (-s ours) am 2888eec0: am 565d20ef: Merge "metricsd: Enable https by default." * commit '604139432841da50906e0cd5247f0d261983d03d':