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:
8dcd293
8a0bb0b
)
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
author
Ajay Panicker
<apanicke@google.com>
Fri, 23 Sep 2016 00:50:56 +0000
(
00:50
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Sep 2016 00:50:56 +0000
(
00:50
+0000)
am:
8a0bb0b0e9
-s ours
Change-Id: I3932557b26e44b79646920641e3b1c6b77123170
Trivial merge