tree 4bfe4bc15b03aa8d8500a76bc6829d7511a69653
parent cb59b9889be18464ca3b9a78ea142c3bafdb289f
author Brian Carlstrom <bdc@google.com> 1359599200 -0800
committer Brian Carlstrom <bdc@google.com> 1360711092 -0800

bouncycastle 1.48 upgrade

(cherry-picked from e1142c149e244797ce73b0e7fad40816e447a817)

Change-Id: Idb04baf42de07b18ddb162e5cd1f98cdadf366f4