aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update iptables to 1.4.7.masterSteve Kondik2010-07-13496-22553/+58447
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
* am 013e402b: am 9bcf5f60: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * am 9bcf5f60: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | |/|
| | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
* | | | iptables: Remove debug module tagSan Mehat2010-01-201-3/+3
* | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|\| | | | |/ / |/| |
| * | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|/| |
| * | merge from eclairJean-Baptiste Queru2009-11-150-0/+0
|/| | | |/
| * eclair snapshotJean-Baptiste Queru2009-11-121-1/+1
* | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-254-510/+0
| |\|
* | | am fb7e6872: remove *.orig files left over from a mergeIliyan Malchev2009-05-264-510/+0
|\ \ \ | | |/ | |/|
| * | remove *.orig files left over from a mergeIliyan Malchev2009-04-284-510/+0
* | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| |
* | | Changed /bin/bash to /bin/sh, cause extended features of bash are not usedAlexey Tarasov2009-03-291-1/+1
* | | Merge branch 'open_source_contributions_cherry_picked' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-180-0/+0
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03325-0/+41532
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03325-41532/+0
| * Merge commit 'remotes/korg/cupcake'Jean-Baptiste Queru2008-12-190-0/+0
| |\ | |/ |/|
* | Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-170-0/+0
| * Changed /bin/bash to /bin/sh, cause extended features of bash are not usedAlexey Tarasov2008-11-091-1/+1
|/
* Initial ContributionThe Android Open Source Project2008-10-21203-6448/+788
* external/iptables 1.3.7Upstream1970-01-12397-0/+47192