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:
9bbc0a2
0ec10c8
)
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
author
Ajay Panicker
<apanicke@google.com>
Thu, 22 Sep 2016 19:56:50 +0000
(19:56 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 22 Sep 2016 19:56:50 +0000
(19:56 +0000)
am:
0ec10c8fdc
-s ours
Change-Id: I66bfa158fdf948f36a98c20c3afc7ee7d73bb920
Trivial merge