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:
b86fd83
a42d23a
)
resolved conflicts for merge of a42d23a7 to lmp-dev-plus-aosp
author
Mathieu Chartier
<mathieuc@google.com>
Wed, 27 Aug 2014 21:31:30 +0000
(14:31 -0700)
committer
Mathieu Chartier
<mathieuc@google.com>
Wed, 27 Aug 2014 21:31:30 +0000
(14:31 -0700)
Change-Id: I0258f55e8199c06948878ba0e9bf7941bf60a435
Trivial merge