tree c3306e7eb74c86bd077cbf334168a804c36408a8
parent aac256734f817852f56f1556f5c764b210975ae6
parent 950d61d946508d21bc6387b0736363c876856384
author Narayan Kamath <narayan@google.com> 1519990476 +0000
committer android-build-merger <android-build-merger@google.com> 1519990476 +0000

Merge "Track renaming of bouncycastle-nojarjar -> bouncycastle-unbundled." am: 77d960f3bb
am: 950d61d946

Change-Id: I16b93ad4c564f24ce6be9d03cc7f57d86b01974f