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:
0b68150
b4ccca6
)
am b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master
author
Scott James Remnant
<keybuk@google.com>
Mon, 19 Oct 2015 19:56:32 +0000
(19:56 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 19 Oct 2015 19:56:32 +0000
(19:56 +0000)
* commit '
b4ccca65781e92ef9096834db8537309917b9cea
':
Fix PAN crash due to fd mismatch
Trivial merge