tree 09f7bc25efefbfb90b4af3334f4c691eab0ea727
parent e454986c5c1e72b8d4aed424bc15ce86bdc2f476
parent 4c111300c39cb2e27f07fc2ae3b00e23ed4443b2
author Brian Carlstrom <bdc@google.com> 1347474182 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347474182 -0700

am 4c111300: bouncycastle 1.47 upgrade

* commit '4c111300c39cb2e27f07fc2ae3b00e23ed4443b2':
  bouncycastle 1.47 upgrade