OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b5e196d
1669fe3
)
Merge "Make test 146 run with secondary dex file in classpath."
author
Alex Light
<allight@google.com>
Fri, 1 Apr 2016 18:54:51 +0000
(18:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 1 Apr 2016 18:54:51 +0000
(18:54 +0000)
am:
1669fe3
* commit '
1669fe3219f295d14c43d5bd3b4e8d255e52be3f
':
Make test 146 run with secondary dex file in classpath.
Change-Id: I88392959b63c6303d6a8da967cb93a2cfaa14f8d
Trivial merge