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:
9118d18
0cc5cc4
)
Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets...
author
Ajay Panicker
<apanicke@google.com>
Fri, 23 Sep 2016 00:52:41 +0000
(
00:52
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Sep 2016 00:52:41 +0000
(
00:52
+0000)
am:
0cc5cc4e6e
-s ours
Change-Id: I2805104c0bf2a19d874167fb4157b377f9ec3f72
Trivial merge