| commit | 4baa857e6d1d4f45384a8ce3c396258c651dacce | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Dec 30 11:47:12 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 30 11:47:12 2015 +0000 |
| tree | 9ce98cc955c38359f5d493f601613ca5bc53433d | |
| parent | 45ae4eb8a23b48e2ea4bbc744a1283b00355eb2b [diff] | |
| parent | 54a5e368fea461a265374db9ecf2c0b4c6825460 [diff] |
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits"" am: 54a5e368fe * commit '54a5e368fea461a265374db9ecf2c0b4c6825460': Revert "Temporary workaround to build bouncycastle / nist-pkits"