tree c3306e7eb74c86bd077cbf334168a804c36408a8
parent a4cd197b0fd4c4d9581fd96c514bd63c3add02b7
parent 77d960f3bba09b4a3c53c41bb7a8e3cad6dfc57b
author Narayan Kamath <narayan@google.com> 1519990063 +0000
committer android-build-merger <android-build-merger@google.com> 1519990063 +0000

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

Change-Id: I594e06c296139c8e865a338a5cf8cee9c3ae16b1