summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-03-06Merge "Use the new command numbering scheme."Robert Greenwalt
2012-03-06Remove reference to hard-coded cpuctl path for bgGlenn Kasten
2012-03-05Merge "remove dependency on utils/List.h"Mathias Agopian
2012-03-05remove dependency on utils/List.hMathias Agopian
2012-03-02am 9c2d6591: am c91e3d47: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-03-02am c91e3d47: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-03-02Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-03-02am e03c41b5: am 4d00f912: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-03-02am 4d00f912: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-03-02Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-03-02merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2012-03-01Prevent potential stall on dns proxy operations.Selim Gurun
2012-03-01am b7aeeb6c: am 500e77d5: am 3c20787d: Increase the valid name of the iface t...Jaime A Lopez-Sollano
2012-02-29Use the new command numbering scheme.Robert Greenwalt
2012-02-29resolved conflicts for merge of 924e6e4d to masterRobert Greenwalt
2012-02-29am 500e77d5: am 3c20787d: Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
2012-02-29am 7de67315: am 3c20787d: Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
2012-02-29am 3c20787d: Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
2012-02-29am 3c20787d: Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
2012-02-29am 3c20787d: Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
2012-02-29Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
2012-02-29Merge "netd: softap: Add ieee80211n=1 parameter for hotspot"Dmitry Shmidt
2012-02-29netd: softap: Add ieee80211n=1 parameter for hotspotDmitry Shmidt
2012-02-23BandwidthController: fix format string bugsNick Kralevich
2012-02-13netd: softap: Add wmm_enabled=1 optionDmitry Shmidt
2012-02-01Merge "Increase the valid name of the iface to IFNAMSIZ"Robert Greenwalt
2012-02-01am c5c68d7b: am ad8126d0: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01am ad8126d0: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-01-31Increase the valid name of the iface to IFNAMSIZJaime A Lopez-Sollano
2012-01-31Merge "Keep better tabs on secondary tables."Robert Greenwalt
2012-01-31Keep better tabs on secondary tables.Robert Greenwalt
2012-01-20am a201914b: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-01-19Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-01-19netd: Rename LOGI/LOGE to ALOGI/ALOGEJP Abgrall
2012-01-19am b210b180: am 4ab46857: Add back hook for inserting OEM specific iptables r...Kazuhiro Ondo
2012-01-18merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2012-01-18am 4ab46857: Add back hook for inserting OEM specific iptables rules.Kazuhiro Ondo
2012-01-18am 4ab46857: Add back hook for inserting OEM specific iptables rules.Kazuhiro Ondo
2012-01-18Add back hook for inserting OEM specific iptables rules.android-cts-4.0.3_r2Kazuhiro Ondo
2012-01-13Use <resolv_iface.h> instead of <resolv.h>David 'Digit' Turner
2012-01-06Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block
2012-01-05Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block
2012-01-04Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block
2012-01-03Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block
2011-12-14am b6331c31: Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-14Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-14netd: fix argument interpretation bugandroid-4.0.3_r1.1android-4.0.3_r1JP Abgrall
2011-12-14am 9e5e0ce6: netd: fix argument interpretation bugJP Abgrall
2011-12-14am 9e5e0ce6: netd: fix argument interpretation bugJP Abgrall