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:
842bac7
aa7f707
)
resolve merge conflicts of 7d0ad232f to oc-dev-plus-aosp
author
Pavlin Radoslavov
<pavlin@google.com>
Thu, 13 Jul 2017 20:54:51 +0000
(20:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 13 Jul 2017 20:54:51 +0000
(20:54 +0000)
am:
aa7f7079f7
Change-Id: Ica0e8327a1eb5ffcd5a60aa3cdd842943f508d15
Trivial merge