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:
4e18eb2
0839305
)
am 08393054: (-s ours) resolved conflicts for merge of 49a86709 to mnc-dev-plus-aosp
author
Marie Janssen
<jamuraa@google.com>
Thu, 27 Aug 2015 10:55:27 +0000
(10:55 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:27 +0000
(10:55 +0000)
* commit '
08393054f0867d0f86a7f9c2eb156e67a86382c7
':
Trivial merge