commit | 2b5f5bd53599576ee7c168f7493d6d45503cbae5 | [log] [tgz] |
---|---|---|
author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 14:36:49 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:36:49 2015 +0000 |
tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
parent | 25d027beaa77b55c408d559e1c923024630bc094 [diff] | |
parent | cff393f18f2c7017de8def6292a8cc125b616427 [diff] |
am c2ba04b9: am 60413943: (-s ours) am 2888eec0: am 565d20ef: Merge "metricsd: Enable https by default." * commit 'c2ba04b90fc1b787b4e4f39c391ed49d20ce2434':