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:
ee9f080
73a9377
)
resolved conflicts for merge of 73a93774 to mnc-dev-plus-aosp
author
Jeff Hao
<jeffhao@google.com>
Mon, 1 Jun 2015 16:58:07 +0000
(09:58 -0700)
committer
Jeff Hao
<jeffhao@google.com>
Mon, 1 Jun 2015 16:58:07 +0000
(09:58 -0700)
Change-Id: I67697bbcab762006fc9c7eed17d06c7e02b0a4a2
Trivial merge