| commit | 1e6ecacb76fabfc405dbd5295eb947b2cde65fb8 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Mon Jun 26 14:57:31 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 26 14:57:31 2017 +0000 |
| tree | 24b263c8c242eb3ef86f60429c056402df23faa9 | |
| parent | eaf604a467ff401cd0e0f74051ff5afa9e07359d [diff] | |
| parent | 823ad5bac1616941ae772fe6b69560b49c89d7b3 [diff] |
Merge "bouncycastle: Android tree with upstream code for version 1.57" into upstream-master