summaryrefslogtreecommitdiffstats
path: root/res/values-es
Commit message (Expand)AuthorAgeFilesLines
* am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for me...Elliott Hughes2012-09-061-2/+0
|\
| * am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-a...Elliott Hughes2012-09-061-2/+0
| |\
| | * resolved conflicts for merge of 33f86196 to stage-aosp-masterElliott Hughes2012-09-061-2/+0
| | |\
| | | * Stop hard-coding sample 12- and 24-hour times.Elliott Hughes2012-09-061-2/+0
| | * | Import translations. DO NOT MERGEYing Wang2012-07-241-4/+8
| | * | Import translations. DO NOT MERGEYing Wang2012-07-171-6/+3
| | * | Import translations. DO NOT MERGEYing Wang2012-07-161-2/+7
| | * | Import translations. DO NOT MERGEYing Wang2012-07-131-0/+2
| | |/
| | * Import translations. DO NOT MERGEYing Wang2012-06-291-10/+5
| | * Import translations. DO NOT MERGEYing Wang2012-06-271-0/+4
| | * Import translations. DO NOT MERGEEric Fischer2012-06-211-12/+6
| | * Import translations. DO NOT MERGEYing Wang2012-06-201-0/+6
| | * Import translations. DO NOT MERGEYing Wang2012-06-181-2/+14
| | * Import translations. DO NOT MERGEYing Wang2012-06-151-6/+3
| | * Import translations. DO NOT MERGEEric Fischer2012-06-131-1/+6
| | * Import translations. DO NOT MERGEYing Wang2012-06-121-2/+2
| | * Import translations. DO NOT MERGEEric Fischer2012-06-111-22/+11
| | * Import translations. DO NOT MERGEEric Fischer2012-06-081-4/+2
| | * Import translations. DO NOT MERGEEric Fischer2012-06-071-3/+4
| | * Import translations. DO NOT MERGEEric Fischer2012-06-061-7/+4
| | * Import translations. DO NOT MERGEEric Fischer2012-06-051-14/+33
| | * Import translations. DO NOT MERGEEric Fischer2012-06-041-14/+13
| | * Import translations. DO NOT MERGEEric Fischer2012-06-011-15/+13
| | * Import translations. DO NOT MERGEEric Fischer2012-05-311-18/+22
| | * Import translations. DO NOT MERGEEric Fischer2012-05-301-10/+16
| | * Import translations. DO NOT MERGEEric Fischer2012-05-291-46/+23
| | * Import translations. DO NOT MERGEEric Fischer2012-05-252-87/+97
| | * Import translations. DO NOT MERGEEric Fischer2012-05-161-17/+10
| | * Import translations. DO NOT MERGEEric Fischer2012-05-151-21/+26
| | * Import translations. DO NOT MERGEEric Fischer2012-05-141-1/+11
| | * Import translations. DO NOT MERGEEric Fischer2012-05-111-3/+4
| | * Import translations. DO NOT MERGEEric Fischer2012-05-101-12/+21
| | * Import translations. DO NOT MERGEEric Fischer2012-05-071-4/+3
| | * Import translations. DO NOT MERGEEric Fischer2012-05-021-1/+5
| | * Import translations. DO NOT MERGEEric Fischer2012-05-011-14/+7
| | * Import translations. DO NOT MERGEEric Fischer2012-04-301-3/+16
| | * Import translations. DO NOT MERGEEric Fischer2012-04-261-18/+17
| * | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-062-26/+27
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-052-27/+26
| * | FIX BUILD (DO NOT MERGE)Mathias Agopian2012-08-312-25/+10
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-292-10/+25
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-281-0/+14
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-271-2/+3
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-241-0/+2
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-231-2/+1
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-221-0/+2
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-211-1/+3
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-141-4/+2
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-101-14/+12
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-091-4/+10