| commit | 178e8bbf25b6d211439133ec8525b7bab52f7796 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Apr 30 09:01:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 09:01:38 2013 -0700 |
| tree | f5888c66301c9967870090085aa2ba2dd08dd12a | |
| parent | 6a5a04ae66c4094164605b59cdc3a35a63c9a26e [diff] | |
| parent | e9ae6822a80cb1f3bd13c785f1727c03d35da52e [diff] |
am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp * commit 'e9ae6822a80cb1f3bd13c785f1727c03d35da52e': Track change to JSSE provider