tree 43530ffb6d12253c1153ff6d343eba92549b4d94
parent 8e47158fabd5bad4282644c6e9ed9ac99c603e33
parent 5304090b17fb5c07091e8573047fb7e8bf2699a7
author Jerome Poichet <jpoichet@google.com> 1426887849 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426887849 +0000

am 5304090b: Fixing build after bouncycastle upgrade to 1.51

* commit '5304090b17fb5c07091e8573047fb7e8bf2699a7':
  Fixing build after bouncycastle upgrade to 1.51