summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-03-09Merge "Merge commit 'android-4.2.2_r1' into merge_branch"M7630AABBQMLZA40901040AU_LINUX_ANDROID_JB_2.5.3.04.02.02.54.060AU_LINUX_ANDROID_JB_2.5.3.04.02.02.054.066AU_LINUX_ANDROID_JB_2.5.3.04.02.02.054.065jb_2.5.3Linux Build Service Account1-4/+6
2013-02-22Merge commit 'android-4.2.2_r1' into merge_branchSrivalli Oguri1-4/+6
2013-01-14resolved conflicts for merge of b40c2385 to jb-mr1.1-devandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1aosp-new/jb-mr1.1-releaseRobert Greenwalt1-1/+1
2013-01-14resolved conflicts for merge of 7b90f090 to jb-mr1-devRobert Greenwalt1-4/+6
2013-01-14am 43682d94: Fix a TOCTOU and symlink attack in netd.Robert Greenwalt1-4/+6
2012-12-15Merge "netd: IPv6 Tethering Support"M8960AAAAANLYA2304M8960AAAAANLYA2303M8960AAAAANLYA106309M8960AAAAANLYA106308M8960AAAAANLYA106307M8930AAAAANLYA4003M8930AAAAANLYA2505M8930AAAAANLYA2504M8930AAAAANLYA17304M7630AABBQMLZA40901030M7630AABBQMLZA40901020M7630AABBQMLZA40901010M7630AABBQMLZA40901000AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.015AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.010AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.009AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.020AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.019AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.018AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.016AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.015AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.014AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.013AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.012AU_LINUX_ANDROID_JB_MR1.04.02.00.49.041AU_LINUX_ANDROID_JB_MR1.04.02.00.49.040AU_LINUX_ANDROID_JB_MR1.04.02.00.49.038AU_LINUX_ANDROID_JB_MR1.04.02.00.49.033AU_LINUX_ANDROID_JB_MR1.04.02.00.49.020AU_LINUX_ANDROID_JB_MR1.04.02.00.49.019AU_LINUX_ANDROID_JB_MR1.04.02.00.49.018AU_LINUX_ANDROID_JB_MR1.04.02.00.49.017AU_LINUX_ANDROID_JB_MR1.04.02.00.49.016AU_LINUX_ANDROID_JB_MR1.04.02.00.49.015AU_LINUX_ANDROID_JB_MR1.04.02.00.49.014AU_LINUX_ANDROID_JB_MR1.04.02.00.49.012AU_LINUX_ANDROID_JB_MR1.04.02.00.49.008AU_LINUX_ANDROID_JB_MR1.04.02.00.49.007AU_LINUX_ANDROID_JB_2.5.3_RB1.04.02.00.67.003AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.047AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.027AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.017AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.011AU_LINUX_ANDROID_JB_2.5.04.02.00.40.075AU_LINUX_ANDROID_JB_2.5.04.02.00.40.074AU_LINUX_ANDROID_JB_2.5.04.02.00.40.072AU_LINUX_ANDROID_JB_2.5.04.02.00.40.070AU_LINUX_ANDROID_JB_2.5.04.02.00.40.068AU_LINUX_ANDROID_JB_2.5.04.02.00.40.066AU_LINUX_ANDROID_JB_2.5.04.02.00.40.064AU_LINUX_ANDROID_JB_2.5.04.02.00.40.061AU_LINUX_ANDROID_JB_2.5.04.02.00.40.059AU_LINUX_ANDROID_JB_2.5.04.02.00.40.055AU_LINUX_ANDROID_JB_2.5.04.02.00.40.054AU_LINUX_ANDROID_JB_2.5.04.02.00.40.053AU_LINUX_ANDROID_JB_2.5.04.02.00.40.052AU_LINUX_ANDROID_JB_2.5.04.02.00.40.051AU_LINUX_ANDROID_JB_2.5.04.02.00.40.050AU_LINUX_ANDROID_JB_2.5.04.02.00.40.049AU_LINUX_ANDROID_JB_2.5.04.02.00.40.048AU_LINUX_ANDROID_JB_2.5.04.02.00.40.047AU_LINUX_ANDROID_JB_2.5.04.02.00.40.046AU_LINUX_ANDROID_JB_2.5.04.02.00.40.043AU_LINUX_ANDROID_JB_2.5.04.02.00.40.042AU_LINUX_ANDROID_JB_2.5.04.02.00.40.041AU_LINUX_ANDROID_JB_2.5.04.02.00.40.040AU_LINUX_ANDROID_JB_2.5.04.02.00.40.036AU_LINUX_ANDROID_JB_2.5.04.02.00.40.030AU_LINUX_ANDROID_JB_2.5.04.02.00.40.027A8064AAAAANLYA1630A8064AAAAANLYA1624A8064AAAAANLYA1623BA8064AAAAANLYA1623A8064AAAAANLYA161012A8064AAAAANLYA161011A8064AAAAANLYA14110A8064AAAAANLGA1623Ajb_mr1_rb1.6jb_mr1_rb1.3jb_2.5.3_rb1.1Linux Build Service Account5-0/+289
2012-12-13netd: IPv6 Tethering SupportChris Lei5-0/+289
2012-11-29Fix a TOCTOU and symlink attack in netd.android-cts-4.1_r4android-cts-4.1_r2aosp-new/jb-devRobert Greenwalt1-4/+6
2012-11-29Fix a TOCTOU and symlink attack in netd.Robert Greenwalt1-4/+6
2012-11-06Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project0-0/+0
2012-09-21merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1M8960AAAAANLYA2302M8960AAAAANLYA2301M8960AAAAANLYA106306M8960AAAAANLYA106305M8930AAAAANLYA2503M8930AAAAANLYA2502M8930AAAAANLYA2501AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.013AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.012AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.011AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.010AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.008AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.007AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.006AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.003AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.003AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.002AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.010AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.009AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.005AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.004AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.003AU_LINUX_ANDROID_JB_2.5.04.02.00.40.024AU_LINUX_ANDROID_JB_2.5.04.02.00.40.023AU_LINUX_ANDROID_JB_2.5.04.02.00.40.022AU_LINUX_ANDROID_JB_2.5.04.02.00.40.021AU_LINUX_ANDROID_JB_2.5.04.02.00.40.020AU_LINUX_ANDROID_JB_2.5.04.02.00.40.019AU_LINUX_ANDROID_JB_2.5.04.02.00.40.018AU_LINUX_ANDROID_JB_2.5.04.02.00.40.016AU_LINUX_ANDROID_JB_2.5.04.02.00.40.015AU_LINUX_ANDROID_JB_2.5.04.02.00.40.010AU_LINUX_ANDROID_JB_2.5.04.02.00.40.009AU_LINUX_ANDROID_JB_2.5.04.02.00.40.008A8064AAAAANLYA2540008A8064AAAAANLYA1622AA8064AAAAANLYA1622A8064AAAAANLYA1621DA8064AAAAANLYA1621CA8064AAAAANLYA16210A8064AAAAANLYA161010A8064AAAAANLYA14111aosp-new/jb-mr1-releaseThe Android Automerger0-0/+0
2012-09-19remove Pan service which is not used anymore.android-sdk-support_r11Zhihai Xu6-201/+0
2012-09-12merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-09-11am 78b00d81: Merge "Don\'t include <linux/...> header files directly."jp abgrall3-3/+3
2012-09-11Merge "Don't include <linux/...> header files directly."aosp-new/tools_r21jp abgrall3-3/+3
2012-09-11Don't include <linux/...> header files directly.Elliott Hughes3-3/+3
2012-09-11Demoting a non-critical error to a warning: unable to load net cmd dll.Sasha Levitskiy1-1/+1
2012-09-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-09-06Add LOG_TAG to NetdConstants.Jeff Sharkey1-0/+2
2012-08-21merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-08-20am 8a3da263: Merge "Fix race condition in pthread_create()"Jean-Baptiste Queru2-5/+5
2012-08-20Merge "Fix race condition in pthread_create()"Jean-Baptiste Queru2-5/+5
2012-08-17Fix race condition in pthread_create()Jurijs Oniscuks2-5/+5
2012-08-13merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-08-10Fix idletimer iptable rules.Haoyu Bai3-27/+62
2012-08-06merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-08-02Changes the interface command API from static lib to a dynamic oneSasha Levitskiy3-75/+70
2012-07-30merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-07-27Merge "Fix idletimer iptable rules."Haoyu Bai3-27/+62
2012-07-27netd: Add initial interface driver command supportDmitry Shmidt5-0/+172
2012-07-27Fix idletimer iptable rules.Haoyu Bai3-27/+62
2012-07-19ndc: get rid of arbritrary command length limitNick Kralevich2-10/+25
2012-07-17Merge "Changed format of interface class acitivity message."Haoyu Bai2-7/+4
2012-07-17Merge "Introduce basic firewall controls."Jeff Sharkey5-1/+339
2012-07-17Introduce basic firewall controls.Jeff Sharkey5-1/+339
2012-07-17Changed format of interface class acitivity message.Haoyu Bai2-7/+4
2012-07-14HACK: Need to startup dhcpd for non-system bluetooth stackMatthew Xie1-1/+8
2012-07-14change logx to alogxMatthew Xie2-11/+11
2012-07-14Added bluetooth reverse tether start/stop cmdzzy3-0/+73
2012-07-13Consolidate iptables chain management.Jeff Sharkey12-118/+206
2012-06-29Merge "Add a class lable parameter to idletimer."Haoyu Bai7-26/+42
2012-06-29Add a class lable parameter to idletimer.Haoyu Bai7-26/+42
2012-06-20netd: interface: Allow setcfg command without addressesDmitry Shmidt1-18/+20
2012-06-19Merge "Clean up softap interface"Irfan Sheriff4-247/+25
2012-06-19Clean up softap interfaceIrfan Sheriff4-247/+25
2012-06-14am 9997f9a3: resolved conflicts for merge of e36a3a2f to jb-dev-plus-aospJean-Baptiste Queru1-3/+5
2012-06-14resolved conflicts for merge of e36a3a2f to jb-dev-plus-aospJean-Baptiste Queru1-3/+5
2012-06-14Merge "Run dnsmasq with options --keep-in-foreground and --pid-file."android-sdk-adt_r20aosp-new/tools_r20aosp-new/ics-plus-aospJean-Baptiste Queru1-3/+5
2012-06-04am c9ed2f47: (-s ours) Allow additional interface flags. Do not mergeJeff Sharkey0-0/+0
2012-06-04Allow additional interface flags. Do not mergeJeff Sharkey1-2/+8