| commit | f978cdc0241b03dda2d7dbc58a9382f37c9c2f10 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Dec 30 11:49:08 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 30 11:49:08 2015 +0000 |
| tree | 9498532513e005d98b3a0a6f3d617d5d14895743 | |
| parent | a0ad80ae797b1336979b395a538c4de49ef03ba5 [diff] | |
| parent | 4baa857e6d1d4f45384a8ce3c396258c651dacce [diff] |
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits"" am: 54a5e368fe am: 4baa857e6d * commit '4baa857e6d1d4f45384a8ce3c396258c651dacce': Revert "Temporary workaround to build bouncycastle / nist-pkits"