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:
237305e
0122cf8
)
Merge '0122cf8b' "Reduce and speed-up class def searches." into lmp-dev-plus-aosp.
author
Marcin Kosiba
<mkosiba@google.com>
Wed, 3 Sep 2014 14:16:47 +0000
(15:16 +0100)
committer
Marcin Kosiba
<mkosiba@google.com>
Wed, 3 Sep 2014 14:16:47 +0000
(15:16 +0100)
Conflicts:
compiler/driver/compiler_driver.cc
runtime/class_linker.cc
Change-Id: I9c98e6a34858f6f9863fc6a0df0506f3a28bd7ee
Trivial merge