summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-30Merge "Import revised translations" into froyoHEADandroid-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_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-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_r1mastermainfroyo-releasefroyoKenny Root
2010-03-30Import revised translationsKenny Root
Change-Id: I38b532a5e0cb76b829bc578c76536c02ebd472f5
2010-03-29relocate android.util.base64.* -> android.util.*Doug Zongker
b/2553469 - API REVIEW: android.util.base64 Change-Id: I1c4af0d2013af4e382cc369d222fa0a6b7bfc513
2010-03-17Import revised translationsKenny Root
Change-Id: Ic5ebc2379330acd46e63dc3e9f53011c394f0e36
2010-03-08Add an empty CleanSpec.mkJean-Baptiste Queru
Change-Id: I62698e93835af429940f98023e264221dd09f224
2010-02-14use framework Base64 instead of android-commonDoug Zongker
Change-Id: Id3a616646192f4e6d8a37ae8f932b067064b11b8
2010-02-11Add an original-package tag that matches the real package name.Jeff Hamilton
Change-Id: Idc9c6eea9a7091198a4cab7ee956d075eeef9f84
2010-02-08use Base64 code from android-commonDoug Zongker
Change-Id: I7758d05eb19e356265aab936ffd52c82b0222d9b
2010-02-05am fb0447e7: am f934e0dc: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit 'fb0447e72c641b2f81e39d2a238e289cf9f26825' * commit 'fb0447e72c641b2f81e39d2a238e289cf9f26825': android-2.1_r1 snapshot
2010-02-05am f934e0dc: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit 'f934e0dc443c844e96535b9fa8cb0bee63f4ca5d' into eclair-plus-aosp * commit 'f934e0dc443c844e96535b9fa8cb0bee63f4ca5d': 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
2010-01-08Deprecate fill_parent and introduce match_parent.Romain Guy
Bug: #2361749.
2010-01-07Update with latest translations.Eric Fischer
2009-12-23Fix reference to NetworkConnectivityListenerTom Taylor
The IM code was still importing this class from its old location. As a result, gtalk didn't work. With this fix, gtalk works again.
2009-12-15Merge commit 'goog/eclair-plus-aosp'Android Git Automerger
2009-12-02am 2816fa23: (-s ours) am d7055284: am 52ee025a: (-s ours) Import revised ↵Eric Fischer
translations. DO NOT MERGE Merge commit '2816fa23415f3e5a790769dbd912d070b9ed08e4' * commit '2816fa23415f3e5a790769dbd912d070b9ed08e4': Import revised translations. DO NOT MERGE
2009-12-02am d7055284: am 52ee025a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'd70552848192d2ff84c67f39b222440a8c5660e0' into eclair-mr2-plus-aosp * commit 'd70552848192d2ff84c67f39b222440a8c5660e0': Import revised translations. DO NOT MERGE
2009-12-02am 52ee025a: Import revised translations. DO NOT MERGEEric Fischer
Merge commit '52ee025a7bcbbb50cd9314270c2dd0bb09256870' into eclair-plus-aosp * commit '52ee025a7bcbbb50cd9314270c2dd0bb09256870': Import revised translations. DO NOT MERGE
2009-12-02am 52ee025a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '52ee025a7bcbbb50cd9314270c2dd0bb09256870' into eclair-mr2 * commit '52ee025a7bcbbb50cd9314270c2dd0bb09256870': Import revised translations. DO NOT MERGE
2009-12-02Import revised translations. DO NOT MERGEandroid-sdk-2.1_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1eclair-sholes-release2eclair-releaseeclair-passion-releaseEric Fischer
2009-12-01am 61985b87: (-s ours) am 47efd89e: am d27d69a3: (-s ours) Import revised ↵Eric Fischer
translations. DO NOT MERGE Merge commit '61985b877354cf18cc22480c056d8d7686f1160e' * commit '61985b877354cf18cc22480c056d8d7686f1160e': Import revised translations. DO NOT MERGE
2009-12-01am 2c7470a7: (-s ours) am 11b8e819: am 00d5eefe: (-s ours) Import revised ↵Eric Fischer
translations. DO NOT MERGE Merge commit '2c7470a76116d960a5c7a36542213cb1d0a2f0f2' * commit '2c7470a76116d960a5c7a36542213cb1d0a2f0f2':
2009-12-01am 47efd89e: am d27d69a3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '47efd89e83f45f0261fc36f09edeb84e8ad60f31' into eclair-mr2-plus-aosp * commit '47efd89e83f45f0261fc36f09edeb84e8ad60f31': Import revised translations. DO NOT MERGE
2009-12-01am 11b8e819: am 00d5eefe: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '11b8e8196313db7e0cf39c438fcacb5d49ee6587' into eclair-mr2-plus-aosp * commit '11b8e8196313db7e0cf39c438fcacb5d49ee6587':
2009-12-01am d27d69a3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'd27d69a311bf43856dcc833c2eeaffdbd6872f50' into eclair-mr2 * commit 'd27d69a311bf43856dcc833c2eeaffdbd6872f50': Import revised translations. DO NOT MERGE
2009-11-30am d27d69a3: Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'd27d69a311bf43856dcc833c2eeaffdbd6872f50' into eclair-plus-aosp * commit 'd27d69a311bf43856dcc833c2eeaffdbd6872f50': Import revised translations. DO NOT MERGE
2009-11-30Import revised translations. DO NOT MERGEEric Fischer
2009-11-15am 3cfd59d1: merge from open-source masterJean-Baptiste Queru
Merge commit '3cfd59d19defbbfed36ec478502faed081b8c1e6' * commit '3cfd59d19defbbfed36ec478502faed081b8c1e6': Import revised translations. DO NOT MERGE 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-13am 00d5eefe: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '00d5eefee46653c22571d2b742fb83052e1f06c5' into eclair-mr2 * commit '00d5eefee46653c22571d2b742fb83052e1f06c5': Import revised translations. DO NOT MERGE
2009-11-13am 00d5eefe: Import revised translations. DO NOT MERGEEric Fischer
Merge commit '00d5eefee46653c22571d2b742fb83052e1f06c5' into eclair-plus-aosp * commit '00d5eefee46653c22571d2b742fb83052e1f06c5': Import revised translations. DO NOT MERGE
2009-11-13Import revised translations. DO NOT MERGEandroid-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.0.1_r1eclair-sholes-releaseEric Fischer
Approver: jerryw
2009-11-12eclair snapshotJean-Baptiste Queru
2009-11-06am ed7ce3ff: (-s ours) am e3e5c4f7: Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'ed7ce3ff3c1545a4d6c8fda68dd2e1a6439715a0' * commit 'ed7ce3ff3c1545a4d6c8fda68dd2e1a6439715a0': Import revised translations. DO NOT MERGE
2009-11-06am e3e5c4f7: Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'e3e5c4f7696fd08e47e05eb0e4c8c4176a621885' into eclair-mr2-plus-aosp * commit 'e3e5c4f7696fd08e47e05eb0e4c8c4176a621885': Import revised translations. DO NOT MERGE
2009-11-06Import revised translations. DO NOT MERGEEric Fischer
2009-10-29am af236f15: (-s ours) am 815d41e4: am 68c0420b: (-s ours) Import revised ↵Eric Fischer
translations. DO NOT MERGE Merge commit 'af236f151ef27abd4ad7dc7ddc513a16d447927a' * commit 'af236f151ef27abd4ad7dc7ddc513a16d447927a': Import revised translations. DO NOT MERGE
2009-10-29am 815d41e4: am 68c0420b: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '815d41e46ecaab9b6e41dc1b68ac4a68a1eb7e15' into eclair-mr2-plus-aosp * commit '815d41e46ecaab9b6e41dc1b68ac4a68a1eb7e15': Import revised translations. DO NOT MERGE
2009-10-29am 68c0420b: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '68c0420bc90101d653366d973b8f12c19975d7a0' into eclair-mr2 * commit '68c0420bc90101d653366d973b8f12c19975d7a0': Import revised translations. DO NOT MERGE
2009-10-28am 68c0420b: Import revised translations. DO NOT MERGEEric Fischer
Merge commit '68c0420bc90101d653366d973b8f12c19975d7a0' into eclair-plus-aosp * commit '68c0420bc90101d653366d973b8f12c19975d7a0': Import revised translations. DO NOT MERGE
2009-10-28Import revised translations. DO NOT MERGEEric Fischer
2009-10-22am cd45a284: (-s ours) am f84198e7: am 2f369db6: (-s ours) Import revised ↵Eric Fischer
translations. DO NOT MERGE Merge commit 'cd45a28464f310c5583d3b3e0d1482c9a3393eae' * commit 'cd45a28464f310c5583d3b3e0d1482c9a3393eae': Import revised translations. DO NOT MERGE
2009-10-22am f84198e7: am 2f369db6: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit 'f84198e7626de013fc37b7f2537e5f26e30cf9d0' into eclair-mr2-plus-aosp * commit 'f84198e7626de013fc37b7f2537e5f26e30cf9d0': Import revised translations. DO NOT MERGE
2009-10-22am 2f369db6: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
Merge commit '2f369db67c0007518008254a04c587864402f4a2' into eclair-mr2 * commit '2f369db67c0007518008254a04c587864402f4a2': Import revised translations. DO NOT MERGE
2009-10-21am 2f369db6: Import revised translations. DO NOT MERGEEric Fischer
Merge commit '2f369db67c0007518008254a04c587864402f4a2' into eclair-plus-aosp * commit '2f369db67c0007518008254a04c587864402f4a2': Import revised translations. DO NOT MERGE
2009-10-21Import revised translations. DO NOT MERGEEric Fischer
Approver: jerryw
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 00:33:15 +0000