OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
26e0daf
9c79802
)
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev am: 6575d4...
author
Niranjan Pendharkar
<npendhar@codeaurora.org>
Fri, 20 Oct 2017 18:26:29 +0000
(18:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 Oct 2017 18:26:29 +0000
(18:26 +0000)
am:
9c798025dd
-s ours
Change-Id: Iac0d7d3c5d44f68d1b6de8bf45621bbd464c30da
Trivial merge