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:
5202195
91efee1
)
Merge "SDP: Bounds check 'id' parameter for free_sdp_slot() am: 82e4754aaa am: 3b90fd...
author
Andre Eisenbach
<eisenbach@google.com>
Thu, 17 Aug 2017 01:00:02 +0000
(
01:00
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 17 Aug 2017 01:00:02 +0000
(
01:00
+0000)
am:
91efee1245
-s ours
Change-Id: Ib565ae2d26bc396d49bca58b9887665e5e185293
Trivial merge