OSDN Git Service

am 59d411c8: Merge changes I57b49033,I03ddf981 into klp-volantis-dev
authorColin Cross <ccross@android.com>
Tue, 17 Dec 2013 21:45:11 +0000 (21:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Dec 2013 21:45:11 +0000 (21:45 +0000)
commitceb2f452a6a9b94ad9407f69c1bd3a9fc8afd6d0
tree46f82dc114664290cb099671658197650df95e41
parentade90e433384cd26758ec0fcb9809dd2a8d50105
parent59d411c8955332349e09f788047b57b2b64eee5e
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