summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-08-04merge from open-source masterandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-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-releasedonut-plus-aospJean-Baptiste Queru
2009-07-29merge from donutJean-Baptiste Queru
2009-07-26reconcile korg/master into goog/masterJean-Baptiste Queru
2009-07-25Merge korg/donut into korg/masterJean-Baptiste Queru
2009-07-14Merge korg/masterJean-Baptiste Queru
2009-07-09am 892f42d5: Removing speech proto from googleclient.jar. Speech proto ↵Mitsuru Oshima
files were archived together by accident. No other changes. I\'ll update ant file to avoid this. Merge commit '892f42d53394dcb248da9eee9a51482b02c77dd0' * commit '892f42d53394dcb248da9eee9a51482b02c77dd0': Removing speech proto from googleclient.jar.
2009-07-09Removing speech proto from googleclient.jar.HEADandroid-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-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_r1mastermaindonut-release2donut-releasedonutMitsuru Oshima
Speech proto files were archived together by accident. No other changes. I'll update ant file to avoid this.
2009-07-02am cce37fab: Updating masf to latest per GlobalSearch team\'s request.Mitsuru Oshima
Merge commit 'cce37fabc9a21a183f5ce7d7754c09558f199093' * commit 'cce37fabc9a21a183f5ce7d7754c09558f199093': Updating masf to latest per GlobalSearch team's request.
2009-07-01Updating masf to latest per GlobalSearch team's request.Mitsuru Oshima
2009-06-23am f5641d84: Updating googleclient-lib (MASF library), built on 22nd June ↵Horia Ciurdar
2009 (includes the new HeatMap proto buffer definition for YouTube) Merge commit 'f5641d849f759ae31e70e1f31d444877f1754244' * commit 'f5641d849f759ae31e70e1f31d444877f1754244': Updating googleclient-lib (MASF library), built on 22nd June 2009 (includes the new HeatMap proto buffer definition for YouTube)
2009-06-23Updating googleclient-lib (MASF library), built on 22nd June 2009 (includes ↵Horia Ciurdar
the new HeatMap proto buffer definition for YouTube)
2009-06-11am e6afe63b: masf update * inputstream perforamnce fix * deubg log fix * ↵Mitsuru Oshima
cleanup classes that are no necessary (DRD, protobuf) Merge commit 'e6afe63b4f53005477cab42b4abcd419f87dd4aa' * commit 'e6afe63b4f53005477cab42b4abcd419f87dd4aa': masf update
2009-06-10masf updateMitsuru Oshima
* inputstream perforamnce fix * deubg log fix * cleanup classes that are no necessary (DRD, protobuf)
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-04-14Merge commit 'korg/cupcake'The Android Open Source Project
2009-04-08Merge branch 'readonly-p4-master'Mitsuru Oshima
2009-04-08AI 145132: am: CL 144958 * Updating masf library to the latest.Mitsuru Oshima
I compiled it using jdk1.6 compilier with target=1.5 option, because google3/wireless stuff now cannot be compiled with jdk1.5. I tested location stuff in Maps app, and it seems to be working (no exception in logcat). Please let m e know if there is other things I should test. Original author: oshima Automated import of CL 145132
2009-04-07AI 144960: Updates the googleclient jarto include the locale fix from ↵android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.5r4android-1.5r3android-1.5r2android-1.5cupcake-releasecupcakeAdam Bliss
4097151-p3. I only updated one single classfile in this jar, namely com/google/common/android/AndroidConfig.class , and I have used javap to ensure that the class is entirely unchanged except for the addition of the two lines in that CL. This change should be very safe and have no impact on anything but the locale. BUG=1774785 Automated import of CL 144960
2009-04-07AI 144958: * Updating masf library to the latest.Mitsuru Oshima
I compiled it using jdk1.6 compilier with target=1.5 option, because google3/wireless stuff now cannot be compiled with jdk1.5. I tested location stuff in Maps app, and it seems to be working (no exception in logcat). Please let m e know if there is other things I should test. Automated import of CL 144958
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project
2009-03-18Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-03-03auto import from //depot/cupcake/@132589The Android Open Source Project
2009-03-02auto import from //depot/cupcake/@137055The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project
2008-10-21Initial Contributionandroid-1.0release-1.0cdma-importThe Android Open Source Project
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 21:07:05 +0000