| commit | 1b335c5efbcf241b55345622fe9978047c3fdf9e | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Fri Feb 08 14:07:05 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 08 14:07:05 2019 +0000 |
| tree | 386cb09b5bf1b30526252cb5fc0ed3ef3c52dd20 | |
| parent | 1e6ecacb76fabfc405dbd5295eb947b2cde65fb8 [diff] | |
| parent | 11b8b14a2780c41215bdb706f63def6ad4faa463 [diff] |
Merge "bouncycastle: Android tree with upstream code for version 1.61" into upstream-master