summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-02-12Merge "Workaround ASan false positive in RouteController."android-n-preview-1brillo-m10-releasebrillo-m10-devEvgenii Stepanov
2016-02-11Workaround ASan false positive in RouteController.Evgenii Stepanov
2015-12-04Merge "Track rename from base/ to android-base/."brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devElliott Hughes
2015-12-04Track rename from base/ to android-base/.Elliott Hughes
2015-11-05Merge "system/netd: check return value of PKCS5_PBKDF2_HMAC_SHA1."Kenny Root
2015-11-05system/netd: check return value of PKCS5_PBKDF2_HMAC_SHA1.Adam Langley
2015-11-02Merge "netd: Add NOTICE and MODULE_LICENSE_* files"Gaurav Shah
2015-11-02Merge "netd: Add NOTICE and MODULE_LICENSE_* files"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devGaurav Shah
2015-11-01netd: Add NOTICE and MODULE_LICENSE_* filesGaurav Shah
2015-09-03am c8683d7e: Don\'t break IPv6 connectivity when in doze mode.Lorenzo Colitti
2015-09-02Don't break IPv6 connectivity when in doze mode.android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devLorenzo Colitti
2015-08-27am f228899a: (-s ours) am 8246d45e: Merge "bundle init.rc contents with its s...Tom Cherry
2015-08-27am 56cc45f1: (-s ours) am f2fed764: Make iptables -L and -S calls wait for xt...Yusuke Sato
2015-08-27am c132be49: (-s ours) am 93e6f6a7: Merge "Make iptables -L and -S calls wait...Yusuke Sato
2015-08-21am 8246d45e: Merge "bundle init.rc contents with its service"Tom Cherry
2015-08-21am 8246d45e: Merge "bundle init.rc contents with its service"Tom Cherry
2015-08-21Merge "bundle init.rc contents with its service"Tom Cherry
2015-08-21am f2fed764: Make iptables -L and -S calls wait for xtables lockYusuke Sato
2015-08-21am f2fed764: Make iptables -L and -S calls wait for xtables lockYusuke Sato
2015-08-20am 93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"Yusuke Sato
2015-08-20bundle init.rc contents with its serviceTom Cherry
2015-08-19Make iptables -L and -S calls wait for xtables lockmarshmallow-devYusuke Sato
2015-08-20am 93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"Yusuke Sato
2015-08-20Merge "Make iptables -L and -S calls wait for xtables lock"Yusuke Sato
2015-08-19Make iptables -L and -S calls wait for xtables lockYusuke Sato
2015-08-18Move local union such that it doesn't escape (and get optimized out).Stephen Hines
2015-08-04Merge "Make netd calls to iptables wait for xtables lock" into mnc-devPaul Jensen
2015-08-04Make netd calls to iptables wait for xtables lockPaul Jensen
2015-07-28Enable use_oif_addrs_only in netd.Erik Kline
2015-07-06Use struct android_net_context when interfacing with bionicErik Kline
2015-06-25netd: add default fw white list for system uidsXiaohui Chen
2015-06-15netd: add two child chains to firewallXiaohui Chen
2015-06-03Fix boolean to integer return value conversion.Erik Kline
2015-05-13Merge "InterfaceController::setBaseReachableTimeMs()" into mnc-devErik Kline
2015-05-13Merge "Partial refactoring and Android-type style changes." into mnc-devErik Kline
2015-05-13InterfaceController::setBaseReachableTimeMs()Erik Kline
2015-05-13Partial refactoring and Android-type style changes.Erik Kline
2015-05-06Add FwmarkServer support for querying whether a UID can access a NetIDPaul Jensen
2015-04-29Blacklist uids for network accessAmith Yamasani
2015-04-28netd: Adds support for uid in idletimer netlink notification.Ruchi Kandoi
2015-04-01Corrently log /set/ MTU error.Erik Kline
2015-03-27Remove uses of libcxx.mk.Dan Albert
2015-03-16am 200e0b53: (-s ours) Merge "Revert "Revert "Update for libbase."""Dan Albert
2015-03-16Merge "Revert "Revert "Update for libbase."""Dan Albert
2015-03-16Merge "Revert "Revert "Update for libbase."""android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongDan Albert
2015-03-16Revert "Revert "Update for libbase.""Dan Albert
2015-03-16Revert "Revert "Update for libbase.""Dan Albert
2015-03-16Revert "Revert "Update for libbase.""Dan Albert
2015-03-16Forgot this in merge resolution.Nicolas Geoffray
2015-03-16resolved conflicts for merge of 6066d418 to masterNicolas Geoffray