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:
3f58724
f7d8a16
)
Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev
author
Narayan Kamath
<narayan@google.com>
Wed, 31 Aug 2016 08:20:09 +0000
(08:20 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 31 Aug 2016 08:20:09 +0000
(08:20 +0000)
am:
f7d8a1648b
Change-Id: I04d1f7a6ddf5d9355e124656e82845b68e2df7cc
Trivial merge