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:
12238c8
dfd6e35
)
Merge "Fix build break from merge conflict" am: c13fbeb220
author
Mathieu Chartier
<mathieuc@google.com>
Wed, 5 Oct 2016 00:59:31 +0000
(
00:59
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 5 Oct 2016 00:59:31 +0000
(
00:59
+0000)
am:
dfd6e355c9
Change-Id: I9c545e3851b8d83807ce11774cfbf7efa833a653
Trivial merge