summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import revised translations.ics-releaseicscm-9.1.0Eric Fischer2011-11-012-0/+40
* Merge "Import revised translations."Eric Fischer2011-10-181-0/+20
|\
| * Import revised translations.Eric Fischer2011-10-181-0/+20
* | am 94d7e982: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ | |/ |/|
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+20
|/
* Import revised translations.Eric Fischer2011-09-201-0/+20
* am ca273e1f: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-160-0/+0
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-161-0/+20
|/
* Import revised translations.Eric Fischer2011-05-264-0/+80
* Reconcile with gingerbread-releaseThe Android Open Source Project2011-05-200-0/+0
|\
| * merge in gingerbread-release history after reset to gingerbreadThe 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
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-210-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-180-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-180-0/+0
| | | |\
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-170-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-160-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-140-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-120-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-110-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-090-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-070-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-040-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-040-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-030-0/+0
| | | |/|
| | | | * Import revised translations. DO NOT MERGEEric Fischer2011-02-181-1/+1
* | | | | am 2f860f15: (-s ours) am 63fff9c7: resolved conflicts for merge of 3a6928aa ...Eric Fischer2011-04-050-0/+0
|\ \ \ \ \
| * \ \ \ \ am 63fff9c7: resolved conflicts for merge of 3a6928aa to gingerbread-plus-aospEric Fischer2011-04-040-0/+0
| |\ \ \ \ \
| | * | | | | resolved conflicts for merge of 3a6928aa to gingerbread-plus-aospEric Fischer2011-04-040-0/+0
| | |\| | | |
| | | * | | | Import revised translations. DO NOT MERGEcm-7.1.0gingerbread-releasegb-release-7.2Eric Fischer2011-03-291-1/+1
| | | |/ / /
* | | | | | am 76fb4bd3: (-s ours) am 684f1cf4: resolved conflicts for merge of 6a1413b1 ...Eric Fischer2011-03-180-0/+0
|\| | | | |
| * | | | | am 684f1cf4: resolved conflicts for merge of 6a1413b1 to gingerbread-plus-aospEric Fischer2011-03-180-0/+0
|/| | | | | | |/ / / /
| * | | | resolved conflicts for merge of 6a1413b1 to gingerbread-plus-aospEric Fischer2011-03-180-0/+0
| |\| | |
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-03-182-3/+3
| | |/ /
* | | | am 8903c338: (-s ours) am 08a65d2c: resolved conflicts for merge of 20c7965d ...Eric Fischer2011-02-220-0/+0
|\ \ \ \
| * | | | am 08a65d2c: resolved conflicts for merge of 20c7965d to gingerbread-plus-aospEric Fischer2011-02-221-0/+2
|/| | | | | |/ / /
| * | | resolved conflicts for merge of 20c7965d to gingerbread-plus-aospEric Fischer2011-02-181-0/+2
| |\| |
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-02-141-1/+1
| | |/
* | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ \ \
| * \ \ Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| |\ \ \
| | * | | am 79753f3b: (-s ours) Import translations for additional languages.Eric Fischer2011-01-250-0/+0
| |/| | | | | | |/ | | |/|