summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c5718a3d: 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
* | | merge from open-source masterJean-Baptiste Queru2009-09-040-0/+0
|\ \ \ | |/ / |/| |
| * | merge from donutJean-Baptiste Queru2009-09-032-0/+193
| |\ \ | | |/
* | | am 58fb7313: Add license-related filesJean-Baptiste Queru2009-08-182-0/+193
|\ \ \ | |/ / |/| / | |/
| * Add license-related filesJean-Baptiste Queru2009-08-172-0/+193
* | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\ \ | |/
* | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ | |/ |/|
| * Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-181-0/+13
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03431-0/+60872
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03431-60859/+0
* | auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-13/+0
* | auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-0/+13
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-170-0/+0
* Initial ContributionThe Android Open Source Project2008-10-21431-0/+60859