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:
b75ec30
f7388e6
)
resolve merge conflicts of f7388e6 to nyc-dev
author
Pavlin Radoslavov
<pavlin@google.com>
Fri, 29 Apr 2016 22:12:33 +0000
(15:12 -0700)
committer
Pavlin Radoslavov
<pavlin@google.com>
Fri, 29 Apr 2016 22:12:33 +0000
(15:12 -0700)
Change-Id: I149778411a50fc5881b84cec01a2a4b43cbd2b5c
Trivial merge