summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-10-09Merge "Fix MDnsSdListener::Monitor::Monitor()"android-l-preview_r2l-previewRobert Greenwalt
2014-10-09Fix MDnsSdListener::Monitor::Monitor()Kévin Petit
2014-09-12Merge "Remove makefile cruft."Dan Albert
2014-09-12Remove makefile cruft.Dan Albert
2014-07-17Merge "Don't choke if IPv6 rules fail."Sreeram Ramachandran
2014-07-19Don't choke if IPv6 rules fail.Sreeram Ramachandran
2014-06-05Merge "Changes uses of index() to strchr()"Dan Albert
2014-06-05Changes uses of index() to strchr()Dan Albert
2014-04-29Merge klp-dev-plus-aosp into stage-aosp-masterBill Yi
2014-04-22Merge "system: netd: prevent infinite loop"idea133-weekly-releaseRobert Greenwalt
2014-04-21Merge "Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve...Sasha Levitskiy
2014-04-21Merge "Fix for DNS resolutions when there is no default network set yet. We n...Robert Greenwalt
2014-04-21Netd: Drop hard-coded libnetcmdiface path, let the system auto-resolve to a p...Sasha Levitskiy
2014-04-17Fix for DNS resolutions when there is no default network set yet.Paul Jensen
2014-04-03Merge "netd: Replace iface with opaque netid in resolver."Robert Greenwalt
2014-04-03system: netd: prevent infinite loopKenneth Tateno
2014-03-27netd: Replace iface with opaque netid in resolver.Szymon Jakubczak
2014-03-26Merge "netd: SCN must be used instead of PRI for scanf functions"Mark Salyzyn
2014-03-26netd: SCN must be used instead of PRI for scanf functionsMark Salyzyn
2014-03-22am f7635e29: Merge "Move VPN routing decisions from iptables to ip" into klp-devChad Brubaker
2014-03-21Merge "Move VPN routing decisions from iptables to ip" into klp-devandroid-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devChad Brubaker
2014-03-21am e287d24e: Merge "Allow overlap in UidMarkMap" into klp-devChad Brubaker
2014-03-21am 954d5d1b: Merge "Update clearifaceforuidrange to take the interface" into ...Chad Brubaker
2014-03-21Merge "Allow overlap in UidMarkMap" into klp-devChad Brubaker
2014-03-21Merge "Update clearifaceforuidrange to take the interface" into klp-devChad Brubaker
2014-03-21am 2a390120: Mark uids without rules with PROTECT_MARKChad Brubaker
2014-03-18am cfb7ebe1: Merge "Fix C++11 violations"JP Abgrall
2014-03-18Merge "Fix C++11 violations"JP Abgrall
2014-03-17Fix C++11 violationsSynergyDev
2014-03-15Allow overlap in UidMarkMapChad Brubaker
2014-03-15Update clearifaceforuidrange to take the interfaceChad Brubaker
2014-03-13Move VPN routing decisions from iptables to ipChad Brubaker
2014-03-13Mark uids without rules with PROTECT_MARKChad Brubaker
2014-03-11am 491086e5: Merge "Changed path to the private dns headers Bug: 13219633"Calin Juravle
2014-03-04Merge "Changed path to the private dns headers Bug: 13219633"Calin Juravle
2014-03-04Changed path to the private dns headersCalin Juravle
2014-01-24am 2bd389e3: Merge "AArch64: Fix printf format strings."Colin Cross
2014-01-24Merge "AArch64: Fix printf format strings."Colin Cross
2014-01-24AArch64: Fix printf format strings.Matthew Leach
2014-01-23am 05952ccb: Merge "netd: remove from include path"Colin Cross
2014-01-23Merge "netd: remove $(KERNEL_HEADERS) from include path"Colin Cross
2014-01-22netd: remove $(KERNEL_HEADERS) from include pathColin Cross
2013-12-18am 7f4117ee: Merge "tethering: Add --dhcp-authoritative to dnsmasq daemon"Dmitry Shmidt
2013-12-18Merge "tethering: Add --dhcp-authoritative to dnsmasq daemon"Dmitry Shmidt
2013-12-18tethering: Add --dhcp-authoritative to dnsmasq daemonDmitry Shmidt
2013-11-22am 57c2b4c8: Merge commit \'f0aa90f7898502aae6a015b49abcb2a5a0719fad\' into HEADThe Android Open Source Project
2013-11-22Merge commit 'f0aa90f7898502aae6a015b49abcb2a5a0719fad' into HEADidea133The Android Open Source Project
2013-11-21am 22f485dc: Merge "Make netd listen for and notify RDNSS options."Lorenzo Colitti
2013-11-21am 6eeea7cb: Merge "Simplify notification code in NetlinkHandler."Lorenzo Colitti
2013-11-21am 634b7b7b: Merge "Don\'t log "Unexpected netlink message" on NDUSEROPT"Lorenzo Colitti