| commit | 32047c387a2a74fabe79dd887f7057295a97a046 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Mon Jan 25 15:44:06 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 25 15:44:06 2016 +0000 |
| tree | 61086f6673133c387b13b0e494e42973c6f4c0e8 | |
| parent | fcfe48e7cf461bf4a6314802c0f31f292d87ab95 [diff] | |
| parent | 16f9ee464b68937f45d009d9c1b0eb9b544a8dee [diff] |
Merge "bouncycastle: Android tree with upstream code for version 1.49" into upstream-master