| commit | 79a89fc8248290c08307ecece501eb9e270e55d1 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 29 23:25:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 29 23:25:16 2013 -0700 |
| tree | 720002c18e0f1afe4f64e6d989d9b88f03af44e2 | |
| parent | dfaf384309d523a30bedcb9fe6da1074bafbe990 [diff] | |
| parent | b4314f15346b05eed956c979c7d05f4732caaae3 [diff] |
am b4314f15: (-s ours) Merge "Track change to JSSE provider" * commit 'b4314f15346b05eed956c979c7d05f4732caaae3': Track change to JSSE provider