OSDN Git Service

am 0bc4a058: Merge "Fix dalvik tests post-conscrypt."
authorElliott Hughes <enh@google.com>
Fri, 3 May 2013 19:17:50 +0000 (12:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 May 2013 19:17:50 +0000 (12:17 -0700)
commit38a473c6c8cc7fbb17f4b0ea7401afb8063b7bf6
treee681e03cd6dbea702cd269bd60d59a0455d23f80
parent0b512ff705cfc8c5e908eb5d67f45451f48dbed0
parent0bc4a05819575824bde922e713146337f7cb5eec
am 0bc4a058: Merge "Fix dalvik tests post-conscrypt."

* commit '0bc4a05819575824bde922e713146337f7cb5eec':
  Fix dalvik tests post-conscrypt.