aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* reconcile korg/master into goog/masterandroid-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releaseJean-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 mergeandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2donut-releaseIliyan 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.7nougat-mr1-arcUpstream1970-01-12397-0/+47192