| commit | 3d9918c2e27fbaaaef1278e99251b6dbcb0e09d3 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Apr 30 09:01:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 09:01:44 2013 -0700 |
| tree | 3b1afc2d4df7e17f459a935ad14c51820fe08c90 | |
| parent | 40ec92c4e072a714c697b9cfd95fab7b052804d1 [diff] | |
| parent | 649143648073116b2ffb6af412b41ecec5280f86 [diff] |
am 64914364: resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp * commit '649143648073116b2ffb6af412b41ecec5280f86': Track change to JSSE provider