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:
8b60538
76fb601
)
resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp
author
Stephen Hines
<srhines@google.com>
Fri, 25 Jul 2014 18:53:48 +0000
(11:53 -0700)
committer
Stephen Hines
<srhines@google.com>
Fri, 25 Jul 2014 18:53:48 +0000
(11:53 -0700)
Change-Id: Ifc9f9fa95dda1dbe60b3be35ef30d2ca707c72d5
Trivial merge