OSDN Git Service

am 8f6082b4: am 15554a2f: Merge "Update dalvik host script for new conscrypt and...
authorBrian Carlstrom <bdc@google.com>
Wed, 1 May 2013 01:14:45 +0000 (18:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 May 2013 01:14:45 +0000 (18:14 -0700)
* commit '8f6082b4b95297f8ed31cd2ba78dc242c797a53c':
  Update dalvik host script for new conscrypt and okhttp classpath entries


Trivial merge