OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f0a81f3
8f6082b
)
am 8f6082b4: am 15554a2f: Merge "Update dalvik host script for new conscrypt and...
author
Brian Carlstrom
<bdc@google.com>
Wed, 1 May 2013 01:14:45 +0000
(18:14 -0700)
committer
Android 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