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:
8d3cf59
b75b8e7
)
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064
author
Pavlin Radoslavov
<pavlin@google.com>
Wed, 15 Mar 2017 05:47:20 +0000
(
05:47
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 15 Mar 2017 05:47:20 +0000
(
05:47
+0000)
am:
b75b8e7f1a
Change-Id: Iab4d37c1e43d62d9132ebf090ac43284f8b668a8
Trivial merge