tree eba2b0c867bfba681df339c5f0bde93383379dfe
parent 15558fa207bb1692564c17e7e9756cdb4e0ad56c
parent befae3aad951656ca44fec38aa33fc4403c7a33e
author Brian Carlstrom <bdc@google.com> 1365022457 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365022457 -0700

am befae3aa: Merge "nist-pkix-tests should only depend on core and core-junit, not frameworks"

* commit 'befae3aad951656ca44fec38aa33fc4403c7a33e':
  nist-pkix-tests should only depend on core and core-junit, not frameworks