summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2009-04-22Merge donut into masterJean-Baptiste Queru
2009-04-22merge cupcake into donutJean-Baptiste Queru
2009-04-22Merge donut into masterJean-Baptiste Queru
2009-03-29reconcile w/p4The Android Open Source Project
2009-03-29reconciledThe Android Open Source Project
2009-03-29reconcile pinyin project with p4 CL 143093 and new nameandroid-sdk-1.5_r3android-sdk-1.5_r1android-1.5r4android-1.5r3android-1.5r2cupcake-releasecupcakeThe Android Open Source Project
2009-03-26import from //branches/cupcake/...@142529android-sdk-1.5-preThe Android Open Source Project