tree 0d23e609651e07c3b9023e14e4908746acdbb483
parent e92451aad4adb1b2406ec7e06585ba3ce76fe144
parent 2f629d3eff3e73b64efdc95b90446d1ff8d4e831
author Alex Klyubin <klyubin@google.com> 1416257769 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416257769 +0000

am 2f629d3e: Merge "Add Bouncy Castle to classpath in run-libcore-tests."

* commit '2f629d3eff3e73b64efdc95b90446d1ff8d4e831':
  Add Bouncy Castle to classpath in run-libcore-tests.