| commit | 65a18d770bb9300cd5f38701305e1ab836081968 | [log] [tgz] |
|---|---|---|
| author | Jonathan Dixon <joth@google.com> | Tue Dec 10 01:49:47 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:49:47 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | 81f24a08851f7d82f193e6ae0948703c4f928ceb [diff] | |
| parent | 2dc41da5b83246aa22a48e24472709e612afebc2 [diff] |
am 2dc41da5: (-s ours) am 6e78fdd9: Merge "Cherry-pick "Reject rather than abort client certificates"" into klp-dev * commit '2dc41da5b83246aa22a48e24472709e612afebc2':