| commit | 1c5ef51aa178320abd6a1eecd025cfdfd72194fd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 00:12:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 00:12:27 2014 +0000 |
| tree | 3cdbf3b2b877a494ef6136b3cfef146419363f1c | |
| parent | 6e81f5fcf51c37275cfe006c820a06d8517a3cce [diff] | |
| parent | a8562f004416b71fda75fa48ad2949190a190d74 [diff] |
am a8562f00: (-s ours) am 460d0ebc: (-s ours) am 6bc4577c: (-s ours) Import translations. DO NOT MERGE * commit 'a8562f004416b71fda75fa48ad2949190a190d74': Import translations. DO NOT MERGE