tree d6dd7d3ea0381f25f24b2cf503667aeb3d07ba4a
parent acd65ba837c0cb05ae63147273d73a73c5cb1d6d
parent f2b7c84468c5397b44566c393bec2675d73817b7
author Brian Carlstrom <bdc@google.com> 1295982232 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295982232 -0800

am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb

* commit 'f2b7c84468c5397b44566c393bec2675d73817b7':
  Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle