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:
c87deb0
4153a39
)
resolved conflicts for merge of 4153a39a to master
author
Ian Rogers
<irogers@google.com>
Wed, 25 Jun 2014 18:10:23 +0000
(11:10 -0700)
committer
Ian Rogers
<irogers@google.com>
Wed, 25 Jun 2014 18:10:23 +0000
(11:10 -0700)
Change-Id: I7e2fa9d5a8ebaa653dd4f25b26d68e13e6abaa27
Trivial merge