OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3fe9184
316589a
)
resolve merge conflicts of 316589aa to nyc-mr1-dev-plus-aosp
author
Andre Eisenbach
<eisenbach@google.com>
Tue, 10 Jan 2017 02:06:48 +0000
(18:06 -0800)
committer
Andre Eisenbach
<eisenbach@google.com>
Tue, 10 Jan 2017 02:06:48 +0000
(18:06 -0800)
Change-Id: I5758549f4c2e1f26d02ff087e240698b13343bbe
Trivial merge