summaryrefslogtreecommitdiffstats
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_r1Jean-Baptiste Queru2009-07-260-0/+0
|\
| * Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-252-12/+151
| |\
* | \ am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from main...Adam Bliss2009-06-112-12/+151
|\ \ \ | | |/ | |/|
| * | Adds a few utilities to ProtoBufUtil, integrating over from mainlineandroid-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_r1Adam Bliss2009-06-102-12/+151
* | | am 7fea449b: Revert "ProtoBuf update"Mitsuru Oshima2009-06-104-653/+171
|\ \ \ | |/ /
| * | Revert "ProtoBuf update"Mitsuru Oshima2009-06-104-653/+171
* | | am 9aaf5076: ProtoBuf update * Added IntMap that uses Hashtable for larger k...Mitsuru Oshima2009-06-104-171/+653
|\ \ \ | |/ /
| * | ProtoBuf updateMitsuru Oshima2009-06-104-171/+653
* | | 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 'korg/cupcake'The Android Open Source Project2009-03-271-0/+1
| |\ | |/ |/|
* | auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-0/+1
| * Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-173-44/+350
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-0/+1750
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-1716/+0
* | auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-38/+4
* | auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-4/+38
* | auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-193-41/+312
* | auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-0/+1
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-170-0/+0
* Initial ContributionThe Android Open Source Project2008-10-214-0/+1444