summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN
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
* | | 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-2/+15
* | | Import translations. DO NOT MERGEBaligh Uddin2012-08-271-0/+2
* | | Import translations. DO NOT MERGEBaligh Uddin2012-08-241-3/+3
* | | am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation f...Jean-Baptiste Queru2012-08-241-0/+1
|\ \ \ | |/ /
| * | am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card wh...Jean-Baptiste Queru2012-08-231-0/+1
| |\ \ | | |/
| | * MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is activeLi Gang2012-08-101-0/+1
| * | Import translations. DO NOT MERGEBaligh Uddin2012-08-141-4/+4
| * | Import translations. DO NOT MERGEYing Wang2012-08-011-3/+3
| * | Import translations. DO NOT MERGEYing Wang2012-07-261-16/+8
| * | Import translations. DO NOT MERGEYing Wang2012-07-241-5/+17
| * | Import translations. DO NOT MERGEYing Wang2012-07-191-6/+3
| * | Import translations. DO NOT MERGEYing Wang2012-07-171-2/+1
| * | Import translations. DO NOT MERGEYing Wang2012-07-161-0/+6
| * | Import translations. DO NOT MERGEYing Wang2012-07-131-0/+2
| |/
| * Import translations. DO NOT MERGEEric Fischer2012-07-021-3/+3
| * Import translations. DO NOT MERGEEric Fischer2012-06-281-4/+2
| * Import translations. DO NOT MERGEYing Wang2012-06-271-3/+7
| * Import translations. DO NOT MERGEYing Wang2012-06-221-6/+3
| * Import translations. DO NOT MERGEEric Fischer2012-06-211-13/+7
| * 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-1/+1
| * Import translations. DO NOT MERGEEric Fischer2012-06-111-20/+10
| * Import translations. DO NOT MERGEEric Fischer2012-06-081-26/+23
| * Import translations. DO NOT MERGEEric Fischer2012-06-071-4/+5
| * Import translations. DO NOT MERGEEric Fischer2012-06-061-25/+22
| * Import translations. DO NOT MERGEEric Fischer2012-06-051-9/+25
| * Import translations. DO NOT MERGEEric Fischer2012-06-041-7/+4
| * Import translations. DO NOT MERGEEric Fischer2012-06-011-15/+12
| * Import translations. DO NOT MERGEEric Fischer2012-05-311-48/+35
| * Import translations. DO NOT MERGEEric Fischer2012-05-301-6/+12
| * Import translations. DO NOT MERGEEric Fischer2012-05-291-3/+3
| * Import translations. DO NOT MERGEEric Fischer2012-05-252-105/+100
| * Import translations. DO NOT MERGEEric Fischer2012-05-161-1/+2
| * Import translations. DO NOT MERGEEric Fischer2012-05-151-17/+28
| * Import translations. DO NOT MERGEEric Fischer2012-05-141-31/+26
| * Import translations. DO NOT MERGEEric Fischer2012-05-111-3/+4
| * Import translations. DO NOT MERGEEric Fischer2012-05-101-13/+37
| * Import translations. DO NOT MERGEEric Fischer2012-05-071-7/+7
| * Import translations. DO NOT MERGEEric Fischer2012-05-031-1/+1
| * Import translations. DO NOT MERGEEric Fischer2012-05-021-14/+11
| * Import translations. DO NOT MERGEEric Fischer2012-05-011-1/+1