OSDN Git Service

am 15554a2f: Merge "Update dalvik host script for new conscrypt and okhttp classpath...
authorBrian Carlstrom <bdc@google.com>
Wed, 1 May 2013 01:12:28 +0000 (18:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 May 2013 01:12:28 +0000 (18:12 -0700)
commit8f6082b4b95297f8ed31cd2ba78dc242c797a53c
tree90ab77cbf89b043f93fbde573382debdab34422e
parentab02e3b7315815dae27ace117a817c91e3e04ad1
parent15554a2f2d4920357f6cf1a0505a178de3781f77
am 15554a2f: Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"

* commit '15554a2f2d4920357f6cf1a0505a178de3781f77':
  Update dalvik host script for new conscrypt and okhttp classpath entries