tree 4bfe4bc15b03aa8d8500a76bc6829d7511a69653
parent 70c8287138e69a98c2f950036f9f703ee37228c8
parent 0caeb7ed943911549bb6fdcc59a99d2c23b3e5de
author Brian Carlstrom <bdc@google.com> 1360712180 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360712180 -0800

am 0caeb7ed: (-s ours) Merge "bouncycastle 1.48 upgrade"

# Via Brian Carlstrom (1) and Gerrit Code Review (1)
* commit '0caeb7ed943911549bb6fdcc59a99d2c23b3e5de':
  bouncycastle 1.48 upgrade