commit | 9e2c31d348381281031d0f28cefe74879514d714 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Fri Mar 02 11:39:38 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 02 11:39:38 2018 +0000 |
tree | cf4c0f9e80627cf50b6f31270afff3cb05037cef | |
parent | deb69a18c9142b4c672327ef381340d98e0c766a [diff] | |
parent | 55af4817a842f0577a1feb7f2ab9e9bb049ceba6 [diff] |
Merge "Switch bouncycastle-nojarjar -> bouncycastle-unbundled." am: 70d9b6a2d8 am: e0053a88ef am: 55af4817a8 Change-Id: I98647f9abe59ac337947e81c71e3b4922ee7fe3e