commit | f1c7471a6107e19a096857c4627c640aeded2807 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Tue Dec 17 21:46:37 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 17 21:46:37 2013 +0000 |
tree | 408a8622a8826cbd5fd4982720770ac15ab78887 | |
parent | b0db3411bc950751c6dbcc0e8c7451c97e3eb8a6 [diff] | |
parent | ceb2f452a6a9b94ad9407f69c1bd3a9fc8afd6d0 [diff] |
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