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:
157799b
45249aa
)
[automerger skipped] Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machin...
author
Hansong Zhang
<hsz@google.com>
Thu, 31 May 2018 22:41:29 +0000
(15:41 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 31 May 2018 22:41:29 +0000
(15:41 -0700)
am:
45249aaaca
-s ours
Change-Id: I851839e32c1edfbaf58af84fc7f9f8ab35e7eeb4
Trivial merge