tree 7b79894e1af0270b5490641cf280c814250b0f5c
parent 1b38b901269667f234d6fd5cee48da0f7109fd37
parent af1b6933e800fd97e694b2bf61100e0b360ef45b
author Colin Cross <ccross@android.com> 1508325969 +0000
committer android-build-merger <android-build-merger@google.com> 1508325969 +0000

Merge "Convert external/bouncycastle to Android.bp" am: ffde9798cb
am: af1b6933e8

Change-Id: I8529a4da1bdd88bb93844a7a980c65f47ddb25a1