tree 408a8622a8826cbd5fd4982720770ac15ab78887
parent b0db3411bc950751c6dbcc0e8c7451c97e3eb8a6
parent ceb2f452a6a9b94ad9407f69c1bd3a9fc8afd6d0
author Colin Cross <ccross@android.com> 1387316797 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387316797 +0000

am ceb2f452: am 59d411c8: Merge changes I57b49033,I03ddf981 into klp-volantis-dev

* commit 'ceb2f452a6a9b94ad9407f69c1bd3a9fc8afd6d0':
  Revert "Disable recovery in PDK builds"
  pdk: add bouncycastle-host javalib.jar to platform.zip