OSDN Git Service
(root)
/
android-x86
/
packages-apps-Bluetooth.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
deed580
ee92804
)
Merge commit 'ee92804' into merge2
author
Etan Cohen
<etancohen@google.com>
Fri, 24 Apr 2015 21:34:30 +0000
(14:34 -0700)
committer
Etan Cohen
<etancohen@google.com>
Fri, 24 Apr 2015 21:34:30 +0000
(14:34 -0700)
1
2
src/com/android/bluetooth/btservice/AdapterService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/bluetooth/btservice/AdapterService.java
Simple merge