summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-08Add an empty CleanSpec.mkHEADandroid-sdk-tools_r7android-sdk-tools_r6android-sdk-tools_r12android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-adt_r12android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-sdk-2.3.4_r1android-sdk-2.2_r2android-sdk-2.2_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1tools_r9tools_r8tools_r7tools_r20mastermainics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releasegingerbread-releasegingerbread-mr4-releasegingerbreadfroyo-releasefroyo-plus-aospfroyoJean-Baptiste Queru
Change-Id: I08bd37d45bfb7da3a7fc8ad0574ef3c257e3dca3
2010-02-05am 280dd013: am 5c26a1c0: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit '280dd0135a308847cc881dbf3feb5b1145158206' * commit '280dd0135a308847cc881dbf3feb5b1145158206': android-2.1_r1 snapshot
2010-02-05am 5c26a1c0: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit '5c26a1c0d38916c686329817a3d07a3d22f9ee10' into eclair-plus-aosp * commit '5c26a1c0d38916c686329817a3d07a3d22f9ee10': android-2.1_r1 snapshot
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-11-15am b8b06516: merge from open-source masterJean-Baptiste Queru
Merge commit 'b8b065168a5949419d1979e74f05979f51da5892' * commit 'b8b065168a5949419d1979e74f05979f51da5892': eclair snapshot
2009-11-15merge from open-source masterJean-Baptiste Queru
2009-11-15merge from open-source masterJean-Baptiste Queru
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15merge from eclairJean-Baptiste Queru
2009-11-12eclair snapshotJean-Baptiste Queru
2009-10-19am 5dc16a77: am 8dfb3331: remove the old ContactsSyncAdapter and ↵Fred Quintana
GoogleContactsProvider Merge commit '5dc16a7788363d7108e74d251c83004e1e1a4a47' * commit '5dc16a7788363d7108e74d251c83004e1e1a4a47': remove the old ContactsSyncAdapter and GoogleContactsProvider
2009-10-19am 8dfb3331: remove the old ContactsSyncAdapter and GoogleContactsProviderFred Quintana
Merge commit '8dfb33315538e53c0425ae7614b5d4de3600e914' into eclair-mr2-plus-aosp * commit '8dfb33315538e53c0425ae7614b5d4de3600e914': remove the old ContactsSyncAdapter and GoogleContactsProvider
2009-10-15remove the old ContactsSyncAdapter and GoogleContactsProviderFred Quintana
2009-10-14am 2fc16d46: merge from open-source masterJean-Baptiste Queru
Merge commit '2fc16d46cef711a6e8e1cd888444a079e14c2cde' * commit '2fc16d46cef711a6e8e1cd888444a079e14c2cde':
2009-10-14merge from open-source masterJean-Baptiste Queru
2009-10-13Reimport translations.Eric Fischer
Change-Id: Ie019851c3b46b11aa59cc1b7c43f842feecb76b3
2009-10-13am 54791a59: (-s ours) am 505845fa: (-s ours) am 84f3e50c: (-s ours) Import ↵Eric Fischer
revised translations. DO NOT MERGE Merge commit '54791a59e2dc18ffe9a68ab525f547c2e6aeb8ff' * commit '54791a59e2dc18ffe9a68ab525f547c2e6aeb8ff': Import revised translations. DO NOT MERGE
2009-10-08am 505845fa: am 84f3e50c: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '505845fa28d62bd4b6e26be2bd44447dfb849327' into eclair-plus-aosp * commit '505845fa28d62bd4b6e26be2bd44447dfb849327': Import revised translations. DO NOT MERGE
2009-10-08am 505845fa: (-s ours) am 84f3e50c: (-s ours) Import revised translations. ↵Eric Fischer
DO NOT MERGE Merge commit '505845fa28d62bd4b6e26be2bd44447dfb849327' into eclair-mr2 * commit '505845fa28d62bd4b6e26be2bd44447dfb849327': Import revised translations. DO NOT MERGE
2009-10-08am 84f3e50c: (-s ours) Import revised translations. DO NOT MERGEandroid-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-releaseEric Fischer
Merge commit '84f3e50c011372ba004ebc349def9558d6dda3c5' into eclair * commit '84f3e50c011372ba004ebc349def9558d6dda3c5': Import revised translations. DO NOT MERGE
2009-10-01am 96bfdf1e: am e731eb05: Merge change I6f238508 into eclairMike Cleron
Merge commit '96bfdf1e36430dea0dd807855fe33715976e89ed' * commit '96bfdf1e36430dea0dd807855fe33715976e89ed': Newer icons
2009-10-01am e161dd8d: am ebdd82ec: Merge change Id43a8e08 into eclairCostin Manolache
Merge commit 'e161dd8dd29717ad51347a4625161dd23e02484e' * commit 'e161dd8dd29717ad51347a4625161dd23e02484e': Remove GAIA string
2009-10-01am 74bdcd9d: am a9c6ba2b: New iconsMike Cleron
Merge commit '74bdcd9dd078c60458ef6a5a46afd4dcce1626c3' * commit '74bdcd9dd078c60458ef6a5a46afd4dcce1626c3': New icons
2009-09-30am e731eb05: Merge change I6f238508 into eclairMike Cleron
Merge commit 'e731eb054ba953c260744abcce913ec3e407cc52' into eclair-plus-aosp * commit 'e731eb054ba953c260744abcce913ec3e407cc52': Newer icons
2009-09-30Merge change I6f238508 into eclairAndroid (Google) Code Review
* changes: Newer icons
2009-09-30Newer iconsMike Cleron
2009-09-29am ebdd82ec: Merge change Id43a8e08 into eclairCostin Manolache
Merge commit 'ebdd82ec2b7c5abb42e2a354470475488a826fd7' into eclair-plus-aosp * commit 'ebdd82ec2b7c5abb42e2a354470475488a826fd7': Remove GAIA string
2009-09-30Merge change Id43a8e08 into eclairAndroid (Google) Code Review
* changes: Remove GAIA string
2009-09-29Remove GAIA stringCostin Manolache
2009-09-29Import revised translations. DO NOT MERGEandroid-sdk-1.6_r2android-1.6_r2donut-releasedonutEric Fischer
2009-09-29am a9c6ba2b: New iconsMike Cleron
Merge commit 'a9c6ba2b43956f964c0751968f2704926ee5a7e7' into eclair-plus-aosp * commit 'a9c6ba2b43956f964c0751968f2704926ee5a7e7': New icons
2009-09-29New iconsMike Cleron
2009-09-25am 8416e9a2: am c6e00cd0: New hdpi artwork.Daniel Sandler
Merge commit '8416e9a29bace67d42e11fbe8ec3a042504f65bd' * commit '8416e9a29bace67d42e11fbe8ec3a042504f65bd': New hdpi artwork.
2009-09-24am c6e00cd0: New hdpi artwork.Daniel Sandler
Merge commit 'c6e00cd02e7fff2c5f9717450b998a36a431a061' into eclair-plus-aosp * commit 'c6e00cd02e7fff2c5f9717450b998a36a431a061': New hdpi artwork.
2009-09-24New hdpi artwork.Daniel Sandler
2009-09-09am 2478bd14: (-s ours) am d55b2ada: Import revised translations. DO NOT MERGEEric Fischer
Merge commit '2478bd1405c5aa1a10e48a7244abbe9106121953' * commit '2478bd1405c5aa1a10e48a7244abbe9106121953': Import revised translations. DO NOT MERGE
2009-09-08am d55b2ada: Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'd55b2adae5f576f385f697258917672bbbbe1f86' into eclair-plus-aosp * commit 'd55b2adae5f576f385f697258917672bbbbe1f86': Import revised translations. DO NOT MERGE
2009-09-08Import revised translations. DO NOT MERGEEric Fischer
2009-09-04am e7d95349: merge from open-source masterJean-Baptiste Queru
Merge commit 'e7d95349a67a999df20c378edc668b60e6b03356' * commit 'e7d95349a67a999df20c378edc668b60e6b03356':
2009-09-04merge from open-source masterJean-Baptiste Queru
2009-09-03merge from donutJean-Baptiste Queru
2009-08-18am e1b016a8: make syncadapter set whether the account is syncableFred Quintana
Merge commit 'e1b016a8ce9133e74e1119aa9232ddce5a7be1e9' * commit 'e1b016a8ce9133e74e1119aa9232ddce5a7be1e9': make syncadapter set whether the account is syncable
2009-08-17make syncadapter set whether the account is syncableFred Quintana
2009-08-16am 1cceac64: (-s ours) do not merge: cherrypicked ↵Fred Quintana
3e94c563dbc36f6d2b4fb230c6909c4ee9011935 and 577cafe633f5e41958b11fc3f7fd6f8444922c85 from master branch Merge commit '1cceac6431729061a9957e4f0d6723f5d09ccaab' * commit '1cceac6431729061a9957e4f0d6723f5d09ccaab': do not merge: cherrypicked 3e94c563dbc36f6d2b4fb230c6909c4ee9011935 and 577cafe633f5e41958b11fc3f7fd6f8444922c85 from master branch
2009-08-15do not merge: cherrypicked 3e94c563dbc36f6d2b4fb230c6909c4ee9011935 and ↵Fred Quintana
577cafe633f5e41958b11fc3f7fd6f8444922c85 from master branch
2009-08-14cleanup the AccountManager APIFred Quintana
2009-08-13add legacy accounts supportFred Quintana
2009-08-07Enhance AbstractGDataSyncAdapter methods for sliding sync.Ken Shirriff
Add the feedSyncData to updateQueryParameters and updateProvider for the use of sliding sync code. This change needs to be submitted in conjunction with the vendor/google/frameworks change.
2009-08-04merge from open-source masterJean-Baptiste Queru
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 10:54:53 +0000