| commit | 2b908f67d0150c11057497f0dc551e3369105184 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri May 21 15:10:31 2010 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Fri May 21 15:10:41 2010 -0700 |
| tree | a296613e281e687f61de27e34e1851c205f9e7d8 | |
| parent | e8c725b8cd415f2896616a09ad7a4787f02ad961 [diff] | |
| parent | 720d1e962e248a30f81c1493081ff4c01e35c839 [diff] |
Merge commit '720d1e962e248a30f81c1493081ff4c01e35c839' into mm Conflicts: libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp Change-Id: I765343d83fe9bd6610f630790fbbf034467834d1