tree bef603b043de0aea966fe338d856c0b2d130a4dd
parent fe42c0184d3a0bef34d112e021dc7dda7799d1ee
parent 234720ebe66540a53cff98b2448dddbc884bd09f
author Brian Carlstrom <bdc@google.com> 1404954482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404954482 +0000

am 234720eb: Merge "Adding unbundled build target for bouncycastle"

* commit '234720ebe66540a53cff98b2448dddbc884bd09f':
  Adding unbundled build target for bouncycastle