| commit | 5a8147ce748e5580775bfe18e4cbc1933de73b19 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 17:49:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:49:39 2014 +0000 |
| tree | ac1420553126c7167abcc6673ec0d68499e881fa | |
| parent | 94b11365faf2b96ec8c4a26c5b66d242dbdd99a4 [diff] | |
| parent | 1c5ef51aa178320abd6a1eecd025cfdfd72194fd [diff] |
am 1c5ef51a: (-s ours) am a8562f00: (-s ours) am 460d0ebc: (-s ours) am 6bc4577c: (-s ours) Import translations. DO NOT MERGE * commit '1c5ef51aa178320abd6a1eecd025cfdfd72194fd': Import translations. DO NOT MERGE