summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-09-14Import translations. DO NOT MERGEandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devBaligh Uddin
2013-08-01Import translations. DO NOT MERGEandroid-4.4_r0.7Baligh Uddin
2013-04-24Import translations. DO NOT MERGEBaligh Uddin
2013-02-19Import translations. DO NOT MERGEandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devBaligh Uddin
2012-10-30Import translations. DO NOT MERGEBaligh Uddin
2012-09-25Import translations. DO NOT MERGEBaligh Uddin
2012-07-16Import translations. DO NOT MERGEandroid-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devYing Wang
2012-07-12Import translations. DO NOT MERGEYing Wang
2012-05-14Import translations. DO NOT MERGEEric Fischer
2012-04-03Merge remote-tracking branch 'goog/ics-aah'android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1tools_r21jb-devMike Lockwood
2012-03-28Revert "Armor magic text in placeholders so it can't get damaged in translati...Eric Fischer
2012-03-28Merge "Armor magic text in placeholders so it can't get damaged in translation."Eric Fischer
2012-03-23Armor magic text in placeholders so it can't get damaged in translation.Eric Fischer
2012-03-23Import 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 Fischer
2011-11-29Import revised translations.Eric Fischer
2011-11-21am 635bfe91: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-11-21am 635bfe91: Import revised translations. DO NOT MERGEEric Fischer
2011-11-21Import 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 Fischer
2011-11-17am 72ee4b3d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-11-16am 72ee4b3d: Import revised translations. DO NOT MERGEEric Fischer
2011-11-16Import revised translations. DO NOT MERGEEric Fischer
2011-11-02Merge "Import revised translations."Eric Fischer
2011-11-02Import revised translations.Eric Fischer
2011-11-01am e4bfd1d4: Import revised translations.Eric Fischer
2011-11-01Import revised translations.Eric Fischer
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-18am f97a1c0b: Merge "Import revised translations."Eric Fischer
2011-10-18Merge "Import revised translations."Eric Fischer
2011-10-18Import revised translations.Eric Fischer
2011-10-18am a3897b23: (-s ours) am 62f5cb35: (-s ours) Import revised translations. D...Eric Fischer
2011-10-18am 62f5cb35: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-18Import 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 Fischer
2011-09-12Import revised translations.Eric Fischer
2011-08-22Import revised translations.Eric Fischer
2011-08-02Import revised translations.Eric Fischer
2011-07-26Import revised translations.Eric Fischer
2011-07-07Import revised translations.Eric Fischer
2011-06-20Import revised translations.Eric Fischer
2011-06-16am 9f530a75: (-s ours) am a0a86d0b: Import revised translations. DO NOT MERGEEric Fischer
2011-06-15am a0a86d0b: Import revised translations. DO NOT MERGEEric Fischer
2011-06-15Import revised translations. DO NOT MERGEEric Fischer
2011-06-02am 566bcee7: (-s ours) am bcd9b2a5: Import revised translations. DO NOT MERGEEric Fischer
2011-05-26Import revised translations.Eric Fischer
2011-05-26am bcd9b2a5: Import revised translations. DO NOT MERGEEric Fischer
2011-05-26Import revised translations. DO NOT MERGEEric Fischer
2011-05-20Reconcile with gingerbread-releaseThe Android Open Source Project
2011-04-01merge 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 Automerger
2011-03-30merge in gingerbread-release history after reset to gingerbreadThe Android Automerger