| commit | 396f5c7afa12acd01ead771eae469b8cd8654fd4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 23:19:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:19:38 2014 +0000 |
| tree | c1acd42a3525f9ba06a28710d0f75b1d9dea024d | |
| parent | e1d46df81faa38f9c91875f32a6c4b4ae3709731 [diff] | |
| parent | 11d84f01773a8ec2a10ec9a1dd74d6c5c7856988 [diff] |
am 11d84f01: (-s ours) am c94a7ce5: (-s ours) am ff0faf82: (-s ours) Import translations. DO NOT MERGE * commit '11d84f01773a8ec2a10ec9a1dd74d6c5c7856988': Import translations. DO NOT MERGE