summaryrefslogtreecommitdiffstats
path: root/res/values-am
Commit message (Expand)AuthorAgeFilesLines
* 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-08-031-5/+5
| * | Import translations. DO NOT MERGEYing Wang2012-07-301-1/+1
| * | Import translations. DO NOT MERGEYing Wang2012-07-271-1/+1
| * | 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-0/+6
| * | Import translations. DO NOT MERGEYing Wang2012-07-131-0/+1
| |/
| * Import translations. DO NOT MERGEYing Wang2012-06-291-4/+2
| * Import translations. DO NOT MERGEYing Wang2012-06-271-1/+5
| * Import translations. DO NOT MERGEEric Fischer2012-06-251-1/+1
| * Import translations. DO NOT MERGEYing Wang2012-06-221-6/+3
| * Import translations. DO NOT MERGEEric Fischer2012-06-201-12/+6
| * Import translations. DO NOT MERGEYing Wang2012-06-201-0/+6
| * Import translations. DO NOT MERGEYing Wang2012-06-181-6/+15
| * Import translations. DO NOT MERGEEric Fischer2012-06-131-2/+7
| * Import translations. DO NOT MERGEYing Wang2012-06-121-4/+4
| * Import translations. DO NOT MERGEEric Fischer2012-06-111-22/+11
| * Import translations. DO NOT MERGEEric Fischer2012-06-081-3/+1
| * Import translations. DO NOT MERGEEric Fischer2012-06-071-1/+2
| * Import translations. DO NOT MERGEEric Fischer2012-06-061-1/+1
| * Import translations. DO NOT MERGEEric Fischer2012-06-051-9/+25
| * Import translations. DO NOT MERGEEric Fischer2012-06-041-10/+9
| * Import translations. DO NOT MERGEEric Fischer2012-06-011-13/+11
| * Import translations. DO NOT MERGEEric Fischer2012-05-311-12/+16
| * Import translations. DO NOT MERGEEric Fischer2012-05-301-6/+12
| * Import translations. DO NOT MERGEEric Fischer2012-05-291-47/+24
| * Import translations. DO NOT MERGEEric Fischer2012-05-252-38/+48
| * Import translations. DO NOT MERGEEric Fischer2012-05-161-31/+17
| * Import translations. DO NOT MERGEEric Fischer2012-05-151-7/+22
| * Import translations. DO NOT MERGEEric Fischer2012-05-141-7/+13
| * Import translations. DO NOT MERGEEric Fischer2012-05-111-31/+18
| * Import translations. DO NOT MERGEEric Fischer2012-05-101-13/+36
| * Import translations. DO NOT MERGEEric Fischer2012-05-071-1/+3
| * Import translations. DO NOT MERGEEric Fischer2012-05-041-4/+2
| * Import translations. DO NOT MERGEEric Fischer2012-05-021-0/+4
| * Import translations. DO NOT MERGEEric Fischer2012-04-301-4/+10
| * Import translations. DO NOT MERGEEric Fischer2012-04-271-5/+5
| * Import translations. DO NOT MERGEEric Fischer2012-04-261-2/+9
* | 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-30/+20
* | Import translations. DO NOT MERGEBaligh Uddin2012-08-292-20/+30
* | 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-221-3/+4
* | Import translations. DO NOT MERGEBaligh Uddin2012-08-211-1/+3