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:
bff03fb
5974d73
)
resolved conflicts for merge of 5974d730 to lmp-dev-plus-aosp
author
Mathieu Chartier
<mathieuc@google.com>
Sat, 30 Aug 2014 18:34:52 +0000
(11:34 -0700)
committer
Mathieu Chartier
<mathieuc@google.com>
Sat, 30 Aug 2014 18:34:52 +0000
(11:34 -0700)
Change-Id: I415996d240a32c2ab7b66e25c824b42c908094dd
Trivial merge