tree c3306e7eb74c86bd077cbf334168a804c36408a8
parent e84b3dff7e80c5476ae65bf5a1d4245663cfdfff
parent 2b76b17978faca03e68fbb703553fdf6c0dfeb09
author Narayan Kamath <narayan@google.com> 1519990911 +0000
committer android-build-merger <android-build-merger@google.com> 1519990911 +0000

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

Change-Id: I6936aebdddf3b5a6855cba7153111ceed26557e1