summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'goog/ics-aah'android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1tools_r21jb-devMike Lockwood2012-04-030-0/+0
|\
| * am 635bfe91: Import revised translations. DO NOT MERGEEric Fischer2011-11-212-2/+2
| |\
| * \ am 72ee4b3d: Import revised translations. DO NOT MERGEEric Fischer2011-11-161-4/+4
| |\ \
| * \ \ am e4bfd1d4: Import revised translations.Eric Fischer2011-11-014-0/+96
| |\ \ \
| * \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \
| | * \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \
| | | * | | | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | | | | |/|/ / / /
| | * | | | am f97a1c0b: Merge "Import revised translations."Eric Fischer2011-10-182-0/+48
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | am a3897b23: (-s ours) am 62f5cb35: (-s ours) Import revised translations. D...Eric Fischer2011-10-180-0/+0
| | |\ \ \ \
* | | | | | | Revert "Armor magic text in placeholders so it can't get damaged in translati...Eric Fischer2012-03-281-2/+2
* | | | | | | Merge "Armor magic text in placeholders so it can't get damaged in translation."Eric Fischer2012-03-281-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Armor magic text in placeholders so it can't get damaged in translation.Eric Fischer2012-03-231-2/+2
* | | | | | | | Import translations. DO NOT MERGEandroid-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releaseEric Fischer2012-03-231-2/+2
|/ / / / / / /
* | | | | | | Import revised translations.Eric Fischer2011-11-293-6/+6
* | | | | | | am 635bfe91: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-210-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Import revised translations. DO NOT MERGEandroid-sdk-adt_r20android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-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_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1Eric Fischer2011-11-212-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | am 72ee4b3d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-170-0/+0
|\| | | | |
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-161-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Import revised translations.Eric Fischer2011-11-024-0/+96
| |/ / /
* / / / Import revised translations.Eric Fischer2011-11-014-0/+96
|/ / /
* | | Merge "Import revised translations."Eric Fischer2011-10-182-0/+48
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-10-182-0/+48
| |/
* | am 62f5cb35: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ | |/ |/|
| * Import revised translations. DO NOT MERGEandroid-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseEric Fischer2011-10-182-0/+48
|/
* Import revised translations.Eric Fischer2011-09-121-1/+1
* Import revised translations.Eric Fischer2011-08-221-4/+4
* Import revised translations.Eric Fischer2011-08-021-2/+1
* Import revised translations.Eric Fischer2011-07-261-1/+1
* Import revised translations.Eric Fischer2011-07-071-2/+2
* Import revised translations.Eric Fischer2011-06-206-3/+100
* am 9f530a75: (-s ours) am a0a86d0b: Import revised translations. DO NOT MERGEEric Fischer2011-06-160-0/+0
|\
| * am a0a86d0b: Import revised translations. DO NOT MERGEEric Fischer2011-06-151-2/+2
| |\
| | * Import revised translations. DO NOT MERGEEric Fischer2011-06-151-2/+2
* | | am 566bcee7: (-s ours) am bcd9b2a5: Import revised translations. DO NOT MERGEEric Fischer2011-06-020-0/+0
|\| |
| * | am bcd9b2a5: Import revised translations. DO NOT MERGEEric Fischer2011-05-261-1/+1
| |\|
| | * Import revised translations. DO NOT MERGEEric Fischer2011-05-261-1/+1
* | | Import revised translations.Eric Fischer2011-05-267-1/+145
* | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \
| * \ \ merge in gingerbread-release history after reset to gingerbreadandroid-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.9gingerbread-releasegingerbread-mr4-releaseThe Android Automerger2011-04-010-0/+0
| |\ \ \
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-300-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-280-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-280-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-250-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-250-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-250-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-240-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-230-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-220-0/+0
| |/| | |
| | * | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-220-0/+0
| |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 10:49:11 +0000