aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 701ad7cc: (-s ours) DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a7...cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Nick Kralevich2010-09-210-0/+0
|\
| * DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from masterNick Kralevich2010-09-2139-28780/+18772
* | upgrade to 1.0.6Nick Kralevich2010-09-2139-28783/+18765
* | add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
|/
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
* 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
* | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-250-0/+0
| |\|
* | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\ \ \ | | |/ | |/|
| * | merge cupcake into donutJean-Baptiste Queru2009-04-220-0/+0
| |\ \
* | | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| | |
| * | | Automated import from //branches/donutburger/...@140818,140818Dianne Hackborn2009-03-241-0/+42
* | | | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-0/+42
| |\ \ \ | | | |/ | | |/|
| | * | auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-191-0/+42
| | |/
| * | Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-180-0/+0
| |\|
* | | Automated import from //branches/master/...@140824,140824Dianne Hackborn2009-03-241-0/+42
| |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0359-0/+130175
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0359-130175/+0
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1759-0/+130175