tree 46f82dc114664290cb099671658197650df95e41
parent ade90e433384cd26758ec0fcb9809dd2a8d50105
parent 59d411c8955332349e09f788047b57b2b64eee5e
author Colin Cross <ccross@android.com> 1387316711 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387316711 +0000

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

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